Changeset 44425 in vbox for trunk/src

Timestamp:

Jan 28, 2013 2:16:06 PM (12 years ago)

Author:

vboxsync

Message:

Main: Some more pVM cleanups.

Location:

trunk/src/VBox/Main

Files:

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

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

@@ -414 +414 @@
 public:
 
-    /**
+    /*
      *  Helper class that safely manages the Console::mpUVM pointer
      *  by calling addVMCaller() on construction and releaseVMCaller() on
      *  destruction. Intended for Console children. The usage pattern is:
      *  <code>
-     *      Console::SaveVMPtr pVM(mParent);
-     *      if (FAILED(pVM.rc())) return pVM.rc();
+     *      Console::SaveVMPtr ptrVM(mParent);
+     *      if (!ptrVM.isOk())
+     *          return ptrVM.rc();
      *      ...
-     *      VMR3ReqCall(pVM, ...
+     *      VMR3ReqCall(ptrVM.rawUVM(), ...
      *      ...
-     *      printf("%p\n", pVM.raw());
+     *      printf("%p\n", ptrVM.rawUVM());
      *  </code>
      *

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

@@ -10 +10 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -648 +648 @@
  *  is done here.
  *
- *  @param   pVM                 VM handle.
+ *  @param   pUVM                The user mode VM handle.
+ *  @param   pVM                 The cross context VM handle.
  *  @param   pvConsole           Pointer to the VMPowerUpTask object.
  *  @return  VBox status code.
@@ -697 +698 @@
  * @return  VBox status code.
  * @param   pUVM        The user mode VM handle.
- * @param   pVM         The shared VM handle.
+ * @param   pVM         The cross context 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
@@ -783 +784 @@
      * This is the only node in the tree.
      */
-    PCFGMNODE pRoot = CFGMR3GetRoot(pVM);
+    PCFGMNODE pRoot = CFGMR3GetRootU(pUVM);
     Assert(pRoot);
 
@@ -1450 +1451 @@
                     default:
                         AssertMsgFailed(("Invalid bootDevice=%d\n", bootDevice));
-                        return VMSetError(pVM, VERR_INVALID_PARAMETER, RT_SRC_POS,
-                                        N_("Invalid boot device '%d'"), bootDevice);
+                        return VMR3SetError(pUVM, VERR_INVALID_PARAMETER, RT_SRC_POS,
+                                            N_("Invalid boot device '%d'"), bootDevice);
                 }
                 InsertConfigString(pBiosCfg, szParamName, pszBootDevice);
@@ -1854 +1855 @@
                     AssertMsgFailed(("Invalid network adapter type '%d' for slot '%d'",
                                     adapterType, ulInstance));
-                    return VMSetError(pVM, VERR_INVALID_PARAMETER, RT_SRC_POS,
-                                      N_("Invalid network adapter type '%d' for slot '%d'"),
-                                      adapterType, ulInstance);
+                    return VMR3SetError(pUVM, VERR_INVALID_PARAMETER, RT_SRC_POS,
+                                        N_("Invalid network adapter type '%d' for slot '%d'"),
+                                        adapterType, ulInstance);
             }
 
@@ -2355 +2356 @@
                         /* Always fatal! Up to VBox 4.0.4 we allowed to start the VM anyway
                          * but this induced problems when the user saved + restored the VM! */
-                        return VMSetError(pVM, VERR_NOT_FOUND, RT_SRC_POS,
+                        return VMR3SetError(pUVM, VERR_NOT_FOUND, RT_SRC_POS,
                                 N_("Implementation of the USB 2.0 controller not found!\n"
                                    "Because the USB 2.0 controller state is part of the saved "
@@ -2608 +2609 @@
                 BOOL fSupports3D = VBoxOglIs3DAccelerationSupported();
                 if (!fSupports3D)
-                    return VMSetError(pVM, VERR_NOT_AVAILABLE, RT_SRC_POS,
+                    return VMR3SetError(pUVM, VERR_NOT_AVAILABLE, RT_SRC_POS,
                             N_("This VM was configured to use 3D acceleration. However, the "
                                "3D support of the host is not working properly and the "
@@ -2856 +2857 @@
  *
  * @returns VBox status code.
- * @param   pVM             The VM handle.
+ * @param   pRoot           The root of the configuration tree.
  * @param   pVirtualBox     Pointer to the IVirtualBox interface.
  * @param   pMachine        Pointer to the IMachine interface.