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

Timestamp:

Jan 25, 2013 9:21:05 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

83364

Message:

VM,++: Changed the VM callbacks (at error, at runtime error, at state change) to use PUVM instead of PVM.

Location:

trunk/src/VBox/Main/src-client

Files:

• ConsoleImpl.cpp (modified) (23 diffs)
• ConsoleImpl2.cpp (modified) (1 diff)
• ConsoleImplTeleporter.cpp (modified) (2 diffs)

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

@@ -3899 +3899 @@
         {
             /* too bad, we failed. try to sync the console state with the VMM state */
-            vmstateChangeCallback(VMR3GetVM(pUVM), VMSTATE_SUSPENDED, enmVMState, pConsole);
+            vmstateChangeCallback(pUVM, VMSTATE_SUSPENDED, enmVMState, pConsole);
         }
         /// @todo (r=dmik) if we failed with drive mount, then the VMR3Resume
@@ -4144 +4144 @@
         {
             /* too bad, we failed. try to sync the console state with the VMM state */
-            vmstateChangeCallback(VMR3GetVM(pUVM), VMSTATE_SUSPENDED, enmVMState, pConsole);
-        }
-        /** @todo: if we failed with drive mount, then the VMR3Resume
+            vmstateChangeCallback(pUVM, VMSTATE_SUSPENDED, enmVMState, pConsole);
+        }
+        /** @todo  if we failed with drive mount, then the VMR3Resume
          * error (if any) will be hidden from the caller. For proper reporting
          * of such multiple errors to the caller we need to enhance the
@@ -4397 +4397 @@
         {
             /* too bad, we failed. try to sync the console state with the VMM state */
-            vmstateChangeCallback(VMR3GetVM(pUVM), VMSTATE_SUSPENDED, enmVMState, pConsole);
+            vmstateChangeCallback(pUVM, VMSTATE_SUSPENDED, enmVMState, pConsole);
         }
         /** @todo: if we failed with drive mount, then the VMR3Resume
@@ -4775 +4775 @@
         {
             /* too bad, we failed. try to sync the console state with the VMM state */
-            vmstateChangeCallback(VMR3GetVM(pUVM), VMSTATE_SUSPENDED, enmVMState, pThis);
+            vmstateChangeCallback(pUVM, VMSTATE_SUSPENDED, enmVMState, pThis);
         }
         /// @todo (r=dmik) if we failed with drive mount, then the VMR3Resume
@@ -5751 +5751 @@
             /* too bad, we failed. try to sync the console state with the VMM state */
             AssertLogRelRC(vrc2);
-            vmstateChangeCallback(ptrVM.raw(), VMSTATE_SUSPENDED, enmVMState, this);
+            vmstateChangeCallback(ptrVM.rawUVM(), VMSTATE_SUSPENDED, enmVMState, this);
         }
     }
@@ -5827 +5827 @@
         {
             /* too bad, we failed. try to sync the console state with the VMM state */
-            vmstateChangeCallback(ptrVM.raw(), VMSTATE_SUSPENDED, enmVMState, this);
+            vmstateChangeCallback(ptrVM.rawUVM(), VMSTATE_SUSPENDED, enmVMState, this);
         }
     }
@@ -7496 +7496 @@
 }
 
-/**
- * VM state callback function. Called by the VMM
- * using its state machine states.
- *
- * Primarily used to handle VM initiated power off, suspend and state saving,
- * but also for doing termination completed work (VMSTATE_TERMINATE).
- *
- * In general this function is called in the context of the EMT.
- *
- * @param   aVM         The VM handle.
- * @param   aState      The new state.
- * @param   aOldState   The old state.
- * @param   aUser       The user argument (pointer to the Console object).
- *
- * @note Locks the Console object for writing.
+/** @callback_method_impl{FNVMATSTATE}
+ *
+ * @note    Locks the Console object for writing.
+ * @remarks The @a pUVM parameter can be NULL in one case where powerUpThread()
+ *          calls after the VM was destroyed.
  */
-DECLCALLBACK(void) Console::vmstateChangeCallback(PVM aVM,
-                                                  VMSTATE aState,
-                                                  VMSTATE aOldState,
-                                                  void *aUser)
-{
-    LogFlowFunc(("Changing state from %s to %s (aVM=%p)\n",
-                 VMR3GetStateName(aOldState), VMR3GetStateName(aState), aVM));
-
-    Console *that = static_cast<Console *>(aUser);
+DECLCALLBACK(void) Console::vmstateChangeCallback(PUVM pUVM, VMSTATE enmState, VMSTATE enmOldState, void *pvUser)
+{
+    LogFlowFunc(("Changing state from %s to %s (pUVM=%p)\n",
+                 VMR3GetStateName(enmOldState), VMR3GetStateName(enmState),     pUVM));
+
+    Console *that = static_cast<Console *>(pvUser);
     AssertReturnVoid(that);
 
@@ -7532 +7519 @@
                      || autoCaller.state() == InUninit);
 
-    switch (aState)
+    switch (enmState)
     {
         /*
@@ -7620 +7607 @@
                 break;
 
-            /* Terminate host interface networking. If aVM is NULL, we've been
+            /* Terminate host interface networking. If pUVM is NULL, we've been
              * manually called from powerUpThread() either before calling
              * VMR3Create() or after VMR3Create() failed, so no need to touch
              * networking.
              */
-            if (aVM)
+            if (pUVM)
                 that->powerDownHostInterfaces();
 
@@ -7740 +7727 @@
 
                 default:
-                    AssertMsgFailed(("%s/%s -> %s\n", Global::stringifyMachineState(that->mMachineState), VMR3GetStateName(aOldState),  VMR3GetStateName(aState) ));
+                    AssertMsgFailed(("%s/%s -> %s\n", Global::stringifyMachineState(that->mMachineState), VMR3GetStateName(enmOldState),  VMR3GetStateName(enmState) ));
                     that->setMachineState(MachineState_Paused);
                     break;
@@ -7749 +7736 @@
         case VMSTATE_RUNNING:
         {
-            if (   aOldState == VMSTATE_POWERING_ON
-                || aOldState == VMSTATE_RESUMING
-                || aOldState == VMSTATE_RUNNING_FT)
+            if (   enmOldState == VMSTATE_POWERING_ON
+                || enmOldState == VMSTATE_RESUMING
+                || enmOldState == VMSTATE_RUNNING_FT)
             {
                 AutoWriteLock alock(that COMMA_LOCKVAL_SRC_POS);
@@ -7760 +7747 @@
                 Assert(   (   (   that->mMachineState == MachineState_Starting
                                || that->mMachineState == MachineState_Paused)
-                           && aOldState == VMSTATE_POWERING_ON)
+                           && enmOldState == VMSTATE_POWERING_ON)
                        || (   (   that->mMachineState == MachineState_Restoring
                                || that->mMachineState == MachineState_TeleportingIn
@@ -7766 +7753 @@
                                || that->mMachineState == MachineState_Saving
                               )
-                           && aOldState == VMSTATE_RESUMING)
+                           && enmOldState == VMSTATE_RESUMING)
                        || (   that->mMachineState == MachineState_FaultTolerantSyncing
-                           && aOldState == VMSTATE_RUNNING_FT));
+                           && enmOldState == VMSTATE_RUNNING_FT));
 
                 that->setMachineState(MachineState_Running);
@@ -7779 +7766 @@
             AssertMsg(   that->mMachineState == MachineState_LiveSnapshotting
                       || that->mMachineState == MachineState_Teleporting,
-                      ("%s/%s -> %s\n", Global::stringifyMachineState(that->mMachineState), VMR3GetStateName(aOldState),  VMR3GetStateName(aState) ));
+                      ("%s/%s -> %s\n", Global::stringifyMachineState(that->mMachineState), VMR3GetStateName(enmOldState),  VMR3GetStateName(enmState) ));
             break;
 
         case VMSTATE_RUNNING_FT:
             AssertMsg(that->mMachineState == MachineState_FaultTolerantSyncing,
-                      ("%s/%s -> %s\n", Global::stringifyMachineState(that->mMachineState), VMR3GetStateName(aOldState),  VMR3GetStateName(aState) ));
+                      ("%s/%s -> %s\n", Global::stringifyMachineState(that->mMachineState), VMR3GetStateName(enmOldState),  VMR3GetStateName(enmState) ));
             break;
 
@@ -8408 +8395 @@
  * and VMR3Teleport.
  *
- * @param   pVM         The VM handle.
+ * @param   pUVM        The user mode VM handle.
  * @param   uPercent    Completion percentage (0-100).
  * @param   pvUser      Pointer to an IProgress instance.
@@ -8414 +8401 @@
  */
 /*static*/
-DECLCALLBACK(int) Console::stateProgressCallback(PVM pVM, unsigned uPercent, void *pvUser)
+DECLCALLBACK(int) Console::stateProgressCallback(PUVM pUVM, unsigned uPercent, void *pvUser)
 {
     IProgress *pProgress = static_cast<IProgress *>(pvUser);
@@ -8422 +8409 @@
         pProgress->SetCurrentOperationProgress(uPercent);
 
+    NOREF(pUVM);
     return VINF_SUCCESS;
 }
@@ -8432 +8420 @@
  */
 /*static*/ DECLCALLBACK(void)
-Console::genericVMSetErrorCallback(PVM pVM, void *pvUser, int rc, RT_SRC_POS_DECL,
+Console::genericVMSetErrorCallback(PUVM pUVM, void *pvUser, int rc, RT_SRC_POS_DECL,
                                    const char *pszErrorFmt, va_list va)
 {
@@ -8450 +8438 @@
 
     va_end(va2);
+
+    NOREF(pUVM);
 }
 
@@ -8456 +8446 @@
  * See VMSetRuntimeError for the detailed description of parameters.
  *
- * @param   pVM             The VM handle.  Ignored, so passing NULL is fine.
+ * @param   pUVM            The user mode VM handle.  Ignored, so passing NULL
+ *                          is fine.
  * @param   pvUser          The user argument, pointer to the Console instance.
  * @param   fFlags          The action flags. See VMSETRTERR_FLAGS_*.
@@ -8465 +8456 @@
  */
 /* static */ DECLCALLBACK(void)
-Console::setVMRuntimeErrorCallback(PVM pVM, void *pvUser, uint32_t fFlags,
+Console::setVMRuntimeErrorCallback(PUVM pUVM, void *pvUser, uint32_t fFlags,
                                    const char *pszErrorId,
                                    const char *pszFormat, va_list va)
@@ -8478 +8469 @@
 
     LogRel(("Console: VM runtime error: fatal=%RTbool, errorID=%s message=\"%s\"\n",
-             fFatal, pszErrorId, message.c_str()));
-
-    that->onRuntimeError(BOOL(fFatal), Bstr(pszErrorId).raw(),
-                         Bstr(message).raw());
-
-    LogFlowFuncLeave();
+            fFatal, pszErrorId, message.c_str()));
+
+    that->onRuntimeError(BOOL(fFatal), Bstr(pszErrorId).raw(), Bstr(message).raw());
+
+    LogFlowFuncLeave(); NOREF(pUVM);
 }
 
@@ -9152 +9142 @@
 
         Assert(pConsole->mpUVM == NULL);
-        vmstateChangeCallback(NULL, VMSTATE_TERMINATED, VMSTATE_CREATING,
-                              pConsole);
+        vmstateChangeCallback(NULL, VMSTATE_TERMINATED, VMSTATE_CREATING, pConsole);
     }
 

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

@@ -161 +161 @@
     for (int i = 0; i < 2; i++)
     {
-        inputStruct.key = (uint32_t)((i == 0) ? 'OSK0' : 'OSK1');
+        inputStruct.key = (uint32_t)(i == 0 ? 'OSK0' : 'OSK1');
         kr = IOConnectCallStructMethod((mach_port_t)port,
                                        (uint32_t)2,

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

@@ -585 +585 @@
  * @copydoc PFNVMPROGRESS
  */
-static DECLCALLBACK(int) teleporterProgressCallback(PVM pVM, unsigned uPercent, void *pvUser)
+static DECLCALLBACK(int) teleporterProgressCallback(PUVM pUVM, unsigned uPercent, void *pvUser)
 {
     TeleporterState *pState = (TeleporterState *)pvUser;
@@ -604 +604 @@
     }
 
+    NOREF(pUVM);
     return VINF_SUCCESS;
 }