Changeset 54798 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Mar 16, 2015 9:09:11 PM (10 years ago)

Author:

vboxsync

Message:

Main/Console: Automatically resume the VM if all passwords were provided correctly

Location:

trunk/src/VBox/Main/src-client

Files:

• ConsoleImpl.cpp (modified) (1 diff)
• ConsoleImpl2.cpp (modified) (5 diffs)

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

@@ -3388 +3388 @@
         m_mapSecretKeys.insert(std::make_pair(aId, pKey));
         hrc = i_configureEncryptionForDisk(aId);
-        if (FAILED(hrc))
+        if (SUCCEEDED(hrc))
+        {
+            if (   m_mapSecretKeys.size() == m_cDisksEncrypted
+                && mMachineState == MachineState_Paused)
+            {
+                /* get the VM handle. */
+                SafeVMPtr ptrVM(this);
+                if (!ptrVM.isOk())
+                    return ptrVM.rc();
+
+                alock.release();
+                int vrc = VMR3Resume(ptrVM.rawUVM(), VMRESUMEREASON_RECONFIG);
+
+                hrc = RT_SUCCESS(vrc) ? S_OK :
+                    setError(VBOX_E_VM_ERROR,
+                             tr("Could not resume the machine execution (%Rrc)"),
+                             vrc);
+            }
+        }
+        else
             m_mapSecretKeys.erase(aId);
     }

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

@@ -4258 +4258 @@
                 /* Pass all custom parameters. */
                 bool fHostIP = true;
-                hrc = i_configMediumProperties(pCfg, pMedium, &fHostIP); H();
+                bool fEncrypted = false;
+                hrc = i_configMediumProperties(pCfg, pMedium, &fHostIP, &fEncrypted); H();
 
                 /* Create an inverted list of parents. */
@@ -4286 +4287 @@
 
                     /* Configure medium properties. */
-                    hrc = i_configMediumProperties(pCur, pMedium, &fHostIP); H();
+                    hrc = i_configMediumProperties(pCur, pMedium, &fHostIP, &fEncrypted); H();
 
                     /* next */
@@ -4297 +4298 @@
                 if (!fHostIP)
                     InsertConfigInteger(pCfg, "HostIPStack", 0);
+
+                if (fEncrypted)
+                    m_cDisksEncrypted++;
             }
         }
@@ -4314 +4318 @@
  *
  * @returns VBox status code.
- * @param   pCur       The current CFGM node.
- * @param   pMedium    The medium object to configure.
- * @param   pfHostIP   Where to return the value of the \"HostIPStack\" property if found.
+ * @param   pCur        The current CFGM node.
+ * @param   pMedium     The medium object to configure.
+ * @param   pfHostIP    Where to return the value of the \"HostIPStack\" property if found.
+ * @param   pfEncrypted Where to return whether the medium is encrypted.
  */
-int Console::i_configMediumProperties(PCFGMNODE pCur, IMedium *pMedium, bool *pfHostIP)
+int Console::i_configMediumProperties(PCFGMNODE pCur, IMedium *pMedium, bool *pfHostIP, bool *pfEncrypted)
 {
     /* Pass all custom parameters. */
@@ -4365 +4370 @@
                         *pfHostIP = false;
                 }
+
+                if (   name.compare("CRYPT/KeyId") == 0
+                    && pfEncrypted)
+                    *pfEncrypted = true;
             }
         }