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

時間撮記:

2015-3-13 下午05:59:58 (10 年 以前)

作者:

vboxsync

訊息:

Fixes for disk encryption when working with snapshots

檔案:

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

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

@@ -5000 +5000 @@
 }
 
+void Console::i_removeSecretKeysOnSuspend()
+{
+    /* Remove keys which are supposed to be removed on a suspend. */
+    SecretKeyMap::iterator it = m_mapSecretKeys.begin();
+    while (it != m_mapSecretKeys.end())
+    {
+        SecretKey *pKey = it->second;
+        if (pKey->m_fRemoveOnSuspend)
+        {
+            /* Unconfigure disk encryption from all attachments associated with this key. */
+            i_clearDiskEncryptionKeysOnAllAttachmentsWithKeyId(it->first);
+
+            AssertMsg(!pKey->m_cRefs, ("No one should access the stored key at this point anymore!\n"));
+            delete pKey;
+            m_mapSecretKeys.erase(it++);
+        }
+        else
+            it++;
+    }
+}
+
 /**
  * Process a network adaptor change.
@@ -6350 +6371 @@
         case MachineState_TeleportingPausedVM:
         case MachineState_Saving:
+
+        /* Remove any keys which are supposed to be removed on a suspend. */
+        if (   aReason == Reason_HostSuspend
+            || aReason == Reason_HostBatteryLow)
+            i_removeSecretKeysOnSuspend();
+
             return setError(VBOX_E_INVALID_VM_STATE, tr("Already paused"));
 
@@ -6379 +6406 @@
     if (RT_FAILURE(vrc))
         hrc = setError(VBOX_E_VM_ERROR, tr("Could not suspend the machine execution (%Rrc)"), vrc);
-    else
-    {
-        /* Remove keys which are supposed to be removed on a VM suspend. */
-        SecretKeyMap::iterator it = m_mapSecretKeys.begin();
-        while (it != m_mapSecretKeys.end())
-        {
-            SecretKey *pKey = it->second;
-            if (pKey->m_fRemoveOnSuspend)
-            {
-                /* Unconfigure disk encryption from all attachments associated with this key. */
-                i_clearDiskEncryptionKeysOnAllAttachmentsWithKeyId(it->first);
-
-                AssertMsg(!pKey->m_cRefs, ("No one should access the stored key at this point anymore!\n"));
-                delete pKey;
-                m_mapSecretKeys.erase(it++);
-            }
-            else
-                it++;
-        }
-    }
+    else if (   aReason == Reason_HostSuspend
+             || aReason == Reason_HostBatteryLow)
+        i_removeSecretKeysOnSuspend();
 
     LogFlowThisFunc(("hrc=%Rhrc\n", hrc));
@@ -10180 +10190 @@
                     throw rc;
 
-                /*
-                 * don't release the lock since reconfigureMediumAttachment
-                 * isn't going to need the Console lock.
-                 */
-
-                /* TODO: do alock.release here as EMT might wait on it! See other places
-                 * where we do VMR3ReqCall requests. See @bugref{7648}. */
+                alock.release();
                 vrc = VMR3ReqCallWaitU(ptrVM.rawUVM(), VMCPUID_ANY,
                                        (PFNRT)i_reconfigureMediumAttachment, 13,
@@ -10192 +10196 @@
                                        fBuiltinIOCache, false /* fSetupMerge */, 0 /* uMergeSource */,
                                        0 /* uMergeTarget */, atts[i], that->mMachineState, &rc);
+                alock.acquire();
                 if (RT_FAILURE(vrc))
                     throw i_setErrorStatic(E_FAIL, Console::tr("%Rrc"), vrc);