Changeset 32190 in vbox for trunk/src/VBox

Timestamp:

Sep 2, 2010 12:20:06 PM (14 years ago)

Author:

vboxsync

Message:

PDMDevHlpVMSuspendSaveAndPowerOff: More code.

Location:

trunk/src/VBox

Files:

• Debugger/testcase/tstVBoxDbg.cpp (modified) (1 diff)
• Devices/PC/DevACPI.cpp (modified) (1 diff)
• Main/ConsoleImpl.cpp (modified) (1 diff)
• Main/testcase/VBox.cpp (deleted)
• VMM/PDMDevHlp.cpp (modified) (5 diffs)
• VMM/VM.cpp (modified) (6 diffs)
• VMM/testcase/tstAnimate.cpp (modified) (1 diff)
• VMM/testcase/tstMicro.cpp (modified) (1 diff)
• VMM/testcase/tstPDMAsyncCompletion.cpp (modified) (1 diff)
• VMM/testcase/tstPDMAsyncCompletionStress.cpp (modified) (1 diff)
• VMM/testcase/tstVMM-HwAccm.cpp (modified) (1 diff)
• VMM/testcase/tstVMM.cpp (modified) (1 diff)
• VMM/testcase/tstVMMFork.cpp (modified) (1 diff)
• VMM/testcase/tstVMREQ.cpp (modified) (1 diff)

trunk/src/VBox/Debugger/testcase/tstVBoxDbg.cpp

@@ -46 +46 @@
      */
     PVM pVM;
-    int rc = VMR3Create(1, NULL, NULL, NULL, NULL, &pVM);
+    int rc = VMR3Create(1, NULL, NULL, NULL, NULL, NULL, &pVM);
     if (RT_SUCCESS(rc))
     {

trunk/src/VBox/Devices/PC/DevACPI.cpp

@@ -1064 +1064 @@
     {
         rc = PDMDevHlpVMSuspendSaveAndPowerOff(pThis->pDevIns);
-        AssertRC(rc);
+        if (rc != VERR_NOT_SUPPORTED)
+            AssertRC(rc);
+        else
+        {
+            LogRel(("ACPI: PDMDevHlpVMSuspendSaveAndPowerOff is not supported, falling back to suspend-only\n"));
+            rc = PDMDevHlpVMSuspend(pThis->pDevIns);
+            AssertRC(rc);
+        }
     }
     else

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -7362 +7362 @@
         alock.leave();
 
-        vrc = VMR3Create(cCpus, Console::genericVMSetErrorCallback, &task->mErrorMsg,
+        vrc = VMR3Create(cCpus, NULL,
+                         Console::genericVMSetErrorCallback, &task->mErrorMsg,
                          task->mConfigConstructor, static_cast<Console *>(console),
                          &pVM);

trunk/src/VBox/VMM/PDMDevHlp.cpp

@@ -28 +28 @@
 #include <VBox/rem.h>
 #include <VBox/dbgf.h>
+#include <VBox/vmapi.h>
 #include <VBox/vm.h>
+#include <VBox/uvm.h>
 #include <VBox/vmm.h>
 
@@ -2814 +2816 @@
              pDevIns->pReg->szName, pDevIns->iInstance));
 
+    /** @todo Always take the SMP path - fewer code paths. */
     if (pVM->cCpus > 1)
     {
@@ -2829 +2832 @@
 
 
+/**
+ * Worker for pdmR3DevHlp_VMSuspendSaveAndPowerOff that is invoked via a queued
+ * EMT request to avoid deadlocks.
+ *
+ * @returns VBox status code fit for scheduling.
+ * @param   pVM                 The VM handle.
+ * @param   pDevIns             The device that triggered this action.
+ */
+static DECLCALLBACK(int) pdmR3DevHlp_VMSuspendSaveAndPowerOffWorker(PVM pVM, PPDMDEVINS pDevIns)
+{
+    /*
+     * Suspend the VM first then do the saving.
+     */
+    int rc = VMR3Suspend(pVM);
+    if (RT_SUCCESS(rc))
+    {
+        rc = pVM->pUVM->pVmm2UserMethods->pfnSaveState(pVM->pUVM->pVmm2UserMethods, pVM);
+
+        /*
+         * On success, power off the VM, on failure we'll leave it suspended.
+         */
+        if (RT_SUCCESS(rc))
+        {
+            rc = VMR3PowerOff(pVM);
+            if (RT_FAILURE(rc))
+                LogRel(("%s/SSP: VMR3PowerOff failed: %Rrc\n", pDevIns->pReg->szName, rc));
+        }
+        else
+            LogRel(("%s/SSP: pfnSaveState failed: %Rrc\n", pDevIns->pReg->szName, rc));
+    }
+    else
+        LogRel(("%s/SSP: Suspend failed: %Rrc\n", pDevIns->pReg->szName, rc));
+    return rc;
+}
+
+
 /** @interface_method_impl{PDMDEVHLPR3,pfnVMSuspendSaveAndPowerOff} */
 static DECLCALLBACK(int) pdmR3DevHlp_VMSuspendSaveAndPowerOff(PPDMDEVINS pDevIns)
 {
-    int rc;
     PDMDEV_ASSERT_DEVINS(pDevIns);
     PVM pVM = pDevIns->Internal.s.pVMR3;
@@ -2839 +2877 @@
              pDevIns->pReg->szName, pDevIns->iInstance));
 
-    /** @todo We'll have to queue a request to avoid deadlock issues. */
-    rc = VERR_NOT_IMPLEMENTED;
+    int rc;
+    if (   pVM->pUVM->pVmm2UserMethods
+        && pVM->pUVM->pVmm2UserMethods->pfnSaveState)
+    {
+        rc = VMR3ReqCallNoWaitU(pVM->pUVM, VMCPUID_ANY_QUEUE, (PFNRT)pdmR3DevHlp_VMSuspendSaveAndPowerOffWorker, 2, pVM, pDevIns);
+        if (RT_SUCCESS(rc))
+        {
+            LogRel(("%s: Suspending, Saving and Powering Off the VM\n", pDevIns->pReg->szName));
+            rc = VINF_EM_SUSPEND;
+        }
+    }
+    else
+        rc = VERR_NOT_SUPPORTED;
 
     LogFlow(("pdmR3DevHlp_VMSuspendSaveAndPowerOff: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
@@ -2857 +2906 @@
              pDevIns->pReg->szName, pDevIns->iInstance));
 
+    /** @todo Always take the SMP path - fewer code paths. */
     if (pVM->cCpus > 1)
     {

trunk/src/VBox/VMM/VM.cpp

@@ -119 +119 @@
 *   Internal Functions                                                         *
 *******************************************************************************/
-static int               vmR3CreateUVM(uint32_t cCpus, PUVM *ppUVM);
-static int               vmR3CreateU(PUVM pUVM, uint32_t cCpus, PFNCFGMCONSTRUCTOR pfnCFGMConstructor, void *pvUserCFGM);
-static int               vmR3InitRing3(PVM pVM, PUVM pUVM);
-static int               vmR3InitVMCpu(PVM pVM);
-static int               vmR3InitRing0(PVM pVM);
-static int               vmR3InitGC(PVM pVM);
-static int               vmR3InitDoCompleted(PVM pVM, VMINITCOMPLETED enmWhat);
+static int                  vmR3CreateUVM(uint32_t cCpus, PCVMM2USERMETHODS pVmm2UserMethods, PUVM *ppUVM);
+static int                  vmR3CreateU(PUVM pUVM, uint32_t cCpus, PFNCFGMCONSTRUCTOR pfnCFGMConstructor, void *pvUserCFGM);
+static int                  vmR3InitRing3(PVM pVM, PUVM pUVM);
+static int                  vmR3InitVMCpu(PVM pVM);
+static int                  vmR3InitRing0(PVM pVM);
+static int                  vmR3InitGC(PVM pVM);
+static int                  vmR3InitDoCompleted(PVM pVM, VMINITCOMPLETED enmWhat);
 static DECLCALLBACK(size_t) vmR3LogPrefixCallback(PRTLOGGER pLogger, char *pchBuf, size_t cchBuf, void *pvUser);
-static void              vmR3DestroyUVM(PUVM pUVM, uint32_t cMilliesEMTWait);
-static void              vmR3AtDtor(PVM pVM);
-static bool              vmR3ValidateStateTransition(VMSTATE enmStateOld, VMSTATE enmStateNew);
-static void              vmR3DoAtState(PVM pVM, PUVM pUVM, VMSTATE enmStateNew, VMSTATE enmStateOld);
-static int               vmR3TrySetState(PVM pVM, const char *pszWho, unsigned cTransitions, ...);
-static void              vmR3SetStateLocked(PVM pVM, PUVM pUVM, VMSTATE enmStateNew, VMSTATE enmStateOld);
-static void              vmR3SetState(PVM pVM, VMSTATE enmStateNew, VMSTATE enmStateOld);
-static int               vmR3SetErrorU(PUVM pUVM, int rc, RT_SRC_POS_DECL, const char *pszFormat, ...);
+static void                 vmR3DestroyUVM(PUVM pUVM, uint32_t cMilliesEMTWait);
+static void                 vmR3AtDtor(PVM pVM);
+static bool                 vmR3ValidateStateTransition(VMSTATE enmStateOld, VMSTATE enmStateNew);
+static void                 vmR3DoAtState(PVM pVM, PUVM pUVM, VMSTATE enmStateNew, VMSTATE enmStateOld);
+static int                  vmR3TrySetState(PVM pVM, const char *pszWho, unsigned cTransitions, ...);
+static void                 vmR3SetStateLocked(PVM pVM, PUVM pUVM, VMSTATE enmStateNew, VMSTATE enmStateOld);
+static void                 vmR3SetState(PVM pVM, VMSTATE enmStateNew, VMSTATE enmStateOld);
+static int                  vmR3SetErrorU(PUVM pUVM, int rc, RT_SRC_POS_DECL, const char *pszFormat, ...);
 
 
@@ -169 +169 @@
  * @returns VBox error code on failure.
  * @param   cCpus               Number of virtual CPUs for the new VM.
+ * @param   pVmm2UserMethods    An optional method table that the VMM can use to
+ *                              make the user perform various action, like for
+ *                              instance state saving.
  * @param   pfnVMAtError        Pointer to callback function for setting VM
  *                              errors. This was added as an implicit call to
@@ -181 +184 @@
  * @param   ppVM                Where to store the 'handle' of the created VM.
  */
-VMMR3DECL(int)   VMR3Create(uint32_t cCpus, PFNVMATERROR pfnVMAtError, void *pvUserVM, PFNCFGMCONSTRUCTOR pfnCFGMConstructor, void *pvUserCFGM, PVM *ppVM)
-{
-    LogFlow(("VMR3Create: cCpus=%RU32 pfnVMAtError=%p pvUserVM=%p  pfnCFGMConstructor=%p pvUserCFGM=%p ppVM=%p\n",
-             cCpus, pfnVMAtError, pvUserVM, pfnCFGMConstructor, pvUserCFGM, ppVM));
+VMMR3DECL(int)   VMR3Create(uint32_t cCpus, PCVMM2USERMETHODS pVmm2UserMethods,
+                            PFNVMATERROR pfnVMAtError, void *pvUserVM,
+                            PFNCFGMCONSTRUCTOR pfnCFGMConstructor, void *pvUserCFGM,
+                            PVM *ppVM)
+{
+    LogFlow(("VMR3Create: cCpus=%RU32 pVmm2UserMethods=%p pfnVMAtError=%p pvUserVM=%p  pfnCFGMConstructor=%p pvUserCFGM=%p ppVM=%p\n",
+             cCpus, pVmm2UserMethods, pfnVMAtError, pvUserVM, pfnCFGMConstructor, pvUserCFGM, ppVM));
+
+    if (pVmm2UserMethods)
+    {
+        AssertPtrReturn(pVmm2UserMethods, VERR_INVALID_POINTER);
+        AssertReturn(pVmm2UserMethods->u32Magic    == VMM2USERMETHODS_MAGIC,   VERR_INVALID_PARAMETER);
+        AssertReturn(pVmm2UserMethods->u32Version  == VMM2USERMETHODS_VERSION, VERR_INVALID_PARAMETER);
+        AssertPtrReturn(pVmm2UserMethods->pfnSaveState, VERR_INVALID_POINTER);
+        AssertReturn(pVmm2UserMethods->u32EndMagic == VMM2USERMETHODS_MAGIC,   VERR_INVALID_PARAMETER);
+    }
+    AssertPtrNullReturn(pfnVMAtError, VERR_INVALID_POINTER);
+    AssertPtrNullReturn(pfnCFGMConstructor, VERR_INVALID_POINTER);
+    AssertPtrReturn(ppVM, VERR_INVALID_POINTER);
 
     /*
@@ -210 +228 @@
      */
     PUVM pUVM = NULL;                   /* shuts up gcc */
-    int rc = vmR3CreateUVM(cCpus, &pUVM);
+    int rc = vmR3CreateUVM(cCpus, pVmm2UserMethods, &pUVM);
     if (RT_FAILURE(rc))
         return rc;
@@ -417 +435 @@
  *
  * @returns VBox status code.
- * @param   cCpus   Number of virtual CPUs
- * @param   ppUVM   Where to store the UVM pointer.
- */
-static int vmR3CreateUVM(uint32_t cCpus, PUVM *ppUVM)
+ * @param   cCpus               Number of virtual CPUs
+ * @param   pVmm2UserMethods    Pointer to the optional VMM -> User method
+ *                              table.
+ * @param   ppUVM               Where to store the UVM pointer.
+ */
+static int vmR3CreateUVM(uint32_t cCpus, PCVMM2USERMETHODS pVmm2UserMethods, PUVM *ppUVM)
 {
     uint32_t i;
@@ -429 +449 @@
     PUVM pUVM = (PUVM)RTMemPageAllocZ(RT_OFFSETOF(UVM, aCpus[cCpus]));
     AssertReturn(pUVM, VERR_NO_MEMORY);
-    pUVM->u32Magic = UVM_MAGIC;
-    pUVM->cCpus = cCpus;
+    pUVM->u32Magic          = UVM_MAGIC;
+    pUVM->cCpus             = cCpus;
+    pUVM->pVmm2UserMethods  = pVmm2UserMethods;
 
     AssertCompile(sizeof(pUVM->vm.s) <= sizeof(pUVM->vm.padding));

trunk/src/VBox/VMM/testcase/tstAnimate.cpp

@@ -824 +824 @@
      */
     PVM pVM;
-    rc = VMR3Create(1, NULL, NULL, cfgmR3CreateDefault, &cbMem, &pVM);
+    rc = VMR3Create(1, NULL, NULL, NULL, cfgmR3CreateDefault, &cbMem, &pVM);
     if (RT_SUCCESS(rc))
     {

trunk/src/VBox/VMM/testcase/tstMicro.cpp

@@ -345 +345 @@
      */
     PVM pVM;
-    int rc = VMR3Create(1, NULL, NULL, NULL, NULL, &pVM);
+    int rc = VMR3Create(1, NULL, NULL, NULL, NULL, NULL, &pVM);
     if (RT_SUCCESS(rc))
     {

trunk/src/VBox/VMM/testcase/tstPDMAsyncCompletion.cpp

@@ -87 +87 @@
 
     PVM pVM;
-    rc = VMR3Create(1, NULL, NULL, NULL, NULL, &pVM);
+    rc = VMR3Create(1, NULL, NULL, NULL, NULL, NULL, &pVM);
     if (RT_SUCCESS(rc))
     {

trunk/src/VBox/VMM/testcase/tstPDMAsyncCompletionStress.cpp

@@ -575 +575 @@
 
     PVM pVM;
-    rc = VMR3Create(1, NULL, NULL, NULL, NULL, &pVM);
+    rc = VMR3Create(1, NULL, NULL, NULL, NULL, NULL, &pVM);
     if (RT_SUCCESS(rc))
     {

trunk/src/VBox/VMM/testcase/tstVMM-HwAccm.cpp

@@ -82 +82 @@
     RTPrintf(TESTCASE ": Initializing...\n");
     PVM pVM;
-    int rc = VMR3Create(1, NULL, NULL, CFGMConstructor, NULL, &pVM);
+    int rc = VMR3Create(1, NULL, NULL, NULL, CFGMConstructor, NULL, &pVM);
     if (RT_SUCCESS(rc))
     {

trunk/src/VBox/VMM/testcase/tstVMM.cpp

@@ -250 +250 @@
     RTPrintf(TESTCASE ": Initializing...\n");
     PVM pVM;
-    rc = VMR3Create(g_cCpus, NULL, NULL, tstVMMConfigConstructor, NULL, &pVM);
+    rc = VMR3Create(g_cCpus, NULL, NULL, NULL, tstVMMConfigConstructor, NULL, &pVM);
     if (RT_SUCCESS(rc))
     {

trunk/src/VBox/VMM/testcase/tstVMMFork.cpp

@@ -67 +67 @@
     RTPrintf(TESTCASE ": Initializing...\n");
     PVM pVM;
-    int rc = VMR3Create(1, NULL, NULL, NULL, NULL, &pVM);
+    int rc = VMR3Create(1, NULL, NULL, NULL, NULL, NULL, &pVM);
     if (RT_SUCCESS(rc))
     {

trunk/src/VBox/VMM/testcase/tstVMREQ.cpp

@@ -215 +215 @@
      */
     PVM pVM;
-    int rc = VMR3Create(1, NULL, NULL, NULL, NULL, &pVM);
+    int rc = VMR3Create(1, NULL, NULL, NULL, NULL, NULL, &pVM);
     if (RT_SUCCESS(rc))
     {