vbox的更動 54978 路徑 trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

時間撮記:

2015-3-26 下午08:49:26 (10 年 以前)

作者:

vboxsync

訊息:

Main/Console: Fix automatic unpausing a VM which has several disks configured with the same password when all passwords are provided

檔案:

• trunk/src/VBox/Main/src-client/ConsoleImpl.cpp (修改) (14 筆差異)

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -3379 +3379 @@
     if (RT_SUCCESS(rc))
     {
+        unsigned cDisksConfigured = 0;
         memcpy(pbKey, aPassword.c_str(), cbKey);
 
@@ -3387 +3388 @@
         /* Add the key to the map */
         m_mapSecretKeys.insert(std::make_pair(aId, pKey));
-        hrc = i_configureEncryptionForDisk(aId);
+        hrc = i_configureEncryptionForDisk(aId, &cDisksConfigured);
         if (SUCCEEDED(hrc))
         {
-            if (   m_mapSecretKeys.size() == m_cDisksEncrypted
+            pKey->m_cDisks = cDisksConfigured;
+            m_cDisksPwProvided += cDisksConfigured;
+
+            if (   m_cDisksPwProvided == m_cDisksEncrypted
                 && mMachineState == MachineState_Paused)
             {
@@ -3445 +3449 @@
         if (RT_SUCCESS(rc))
         {
+            unsigned cDisksConfigured = 0;
             memcpy(pbKey, aPasswords[i].c_str(), cbKey);
 
@@ -3453 +3458 @@
             /* Add the key to the map */
             m_mapSecretKeys.insert(std::make_pair(aIds[i], pKey));
-            hrc = i_configureEncryptionForDisk(aIds[i]);
+            hrc = i_configureEncryptionForDisk(aIds[i], &cDisksConfigured);
             if (FAILED(hrc))
                 m_mapSecretKeys.erase(aIds[i]);
+            else
+                pKey->m_cDisks = cDisksConfigured;
         }
         else
@@ -3467 +3474 @@
              */
             for (unsigned ii = 0; ii < i; ii++)
+            {
+                i_clearDiskEncryptionKeysOnAllAttachmentsWithKeyId(aIds[ii]);
                 removeDiskEncryptionPassword(aIds[ii]);
+            }
 
             break;
@@ -3474 +3484 @@
 
     if (   SUCCEEDED(hrc)
-        && m_mapSecretKeys.size() == m_cDisksEncrypted
+        && m_cDisksPwProvided == m_cDisksEncrypted
         && mMachineState == MachineState_Paused)
     {
@@ -3508 +3518 @@
         return setError(VBOX_E_OBJECT_IN_USE, tr("The password is still in use by the VM"));
 
+    m_cDisksPwProvided -= pKey->m_cDisks;
     m_mapSecretKeys.erase(it);
     delete pKey;
@@ -3534 +3545 @@
         delete it->second;
     m_mapSecretKeys.clear();
+    m_cDisksPwProvided = 0;
 
     return S_OK;
@@ -4850 +4862 @@
  *
  * @returns COM status code.
- * @param   strId    The ID of the password.
+ * @param   strId                The ID of the password.
+ * @param   pcDisksConfigured    Where to store the number of disks configured for the given ID.
  */
-HRESULT Console::i_configureEncryptionForDisk(const com::Utf8Str &strId)
-{
+HRESULT Console::i_configureEncryptionForDisk(const com::Utf8Str &strId, unsigned *pcDisksConfigured)
+{
+    unsigned cDisksConfigured = 0;
     HRESULT hrc = S_OK;
     SafeIfaceArray<IMediumAttachment> sfaAttachments;
@@ -4959 +4973 @@
                         rc = pIMedium->pfnSetSecKeyIf(pIMedium, mpIfSecKey, mpIfSecKeyHlp);
                         if (rc == VERR_VD_PASSWORD_INCORRECT)
-                            return setError(VBOX_E_PASSWORD_INCORRECT, tr("The provided password for ID \"%s\" is not correct for at least one disk using this ID"),
-                                            strId.c_str());
+                        {
+                            hrc = setError(VBOX_E_PASSWORD_INCORRECT, tr("The provided password for ID \"%s\" is not correct for at least one disk using this ID"),
+                                           strId.c_str());
+                            break;
+                        }
                         else if (RT_FAILURE(rc))
-                            return setError(E_FAIL, tr("Failed to set the encryption key (%Rrc)"), rc);
+                        {
+                            hrc = setError(E_FAIL, tr("Failed to set the encryption key (%Rrc)"), rc);
+                            break;
+                        }
+
+                        if (RT_SUCCESS(rc))
+                           cDisksConfigured++;
                     }
                 }
@@ -4969 +4992 @@
             }
         }
+    }
+
+    if (   SUCCEEDED(hrc)
+        && pcDisksConfigured)
+        *pcDisksConfigured = cDisksConfigured;
+    else if (FAILED(hrc))
+    {
+        /* Clear disk encryption setup on successfully configured attachments. */
+        i_clearDiskEncryptionKeysOnAllAttachmentsWithKeyId(strId);
     }
 
@@ -5045 +5077 @@
                     /* Add the key to the map */
                     m_mapSecretKeys.insert(std::make_pair(Utf8Str(pszUuid), pKey));
-                    hrc = i_configureEncryptionForDisk(Utf8Str(pszUuid));
+                    hrc = i_configureEncryptionForDisk(Utf8Str(pszUuid), NULL);
                     if (FAILED(hrc))
                     {
@@ -5112 +5144 @@
 
             AssertMsg(!pKey->m_cRefs, ("No one should access the stored key at this point anymore!\n"));
+            m_cDisksPwProvided -= pKey->m_cDisks;
             delete pKey;
             m_mapSecretKeys.erase(it++);
@@ -6507 +6540 @@
     else if (   aReason == Reason_HostSuspend
              || aReason == Reason_HostBatteryLow)
+    {
+        alock.acquire();
         i_removeSecretKeysOnSuspend();
+    }
 
     LogFlowThisFunc(("hrc=%Rhrc\n", hrc));