Changeset 44387 in vbox for trunk/src/VBox/Main

Timestamp:

Jan 25, 2013 6:31:58 PM (12 years ago)

Author:

vboxsync

Message:

CFGM: Changed the config constructor to take a PUVM as well as a PVM parameter.

Location:

trunk/src/VBox/Main

Files:

• include/ConsoleImpl.h (modified) (1 diff)
• src-client/ConsoleImpl2.cpp (modified) (3 diffs)

trunk/src/VBox/Main/include/ConsoleImpl.h

@@ -526 +526 @@
     HRESULT removeSharedFolder(const Utf8Str &strName);
 
-    static DECLCALLBACK(int) configConstructor(PVM pVM, void *pvConsole);
-    int configConstructorInner(PVM pVM, AutoWriteLock *pAlock);
+    static DECLCALLBACK(int) configConstructor(PUVM pUVM, PVM pVM, void *pvConsole);
+    int configConstructorInner(PUVM pUVM, PVM pVM, AutoWriteLock *pAlock);
     int configCfgmOverlay(PVM pVM, IVirtualBox *pVirtualBox, IMachine *pMachine);
     int configDumpAPISettingsTweaks(IVirtualBox *pVirtualBox, IMachine *pMachine);

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

@@ -658 +658 @@
  *  @note Locks the Console object for writing.
  */
-DECLCALLBACK(int) Console::configConstructor(PVM pVM, void *pvConsole)
+DECLCALLBACK(int) Console::configConstructor(PUVM pUVM, PVM pVM, void *pvConsole)
 {
     LogFlowFuncEnter();
@@ -675 +675 @@
      * can easily reset the VM handle on failure.
      */
-    PUVM pUVM = pConsole->mpUVM = VMR3GetUVM(pVM);
+    pConsole->mpUVM = pUVM;
     VMR3RetainUVM(pUVM);
     int vrc;
     try
     {
-        vrc = pConsole->configConstructorInner(pVM, &alock);
+        vrc = pConsole->configConstructorInner(pUVM, pVM, &alock);
     }
     catch (...)
@@ -700 +700 @@
  *
  * @return  VBox status code.
- * @param   pVM         The VM handle.
+ * @param   pUVM        The user mode VM handle.
+ * @param   pVM         The shared VM handle.
  * @param   pAlock      The automatic lock instance.  This is for when we have
  *                      to leave it in order to avoid deadlocks (ext packs and
  *                      more).
  */
-int Console::configConstructorInner(PVM pVM, AutoWriteLock *pAlock)
+int Console::configConstructorInner(PUVM pUVM, PVM pVM, AutoWriteLock *pAlock)
 {
-    PUVM            pUVM      = VMR3GetUVM(pVM);
     VMMDev         *pVMMDev   = m_pVMMDev; Assert(pVMMDev);
     ComPtr<IMachine> pMachine = machine();