Changeset 48528 in vbox for trunk/src/VBox/VMM

Timestamp:

Sep 18, 2013 8:39:01 PM (11 years ago)

Author:

vboxsync

Message:

Change implementation for turning a reset into a power off to prevent the VM from executing while the power down thread is not running

Location:

trunk/src/VBox/VMM

Files:

• VMMR3/VM.cpp (modified) (4 diffs)
• include/VMInternal.h (modified) (1 diff)

trunk/src/VBox/VMM/VMMR3/VM.cpp

@@ -197 +197 @@
         AssertPtrNullReturn(pVmm2UserMethods->pfnNotifyPdmtInit, VERR_INVALID_POINTER);
         AssertPtrNullReturn(pVmm2UserMethods->pfnNotifyPdmtTerm, VERR_INVALID_POINTER);
+        AssertPtrNullReturn(pVmm2UserMethods->pfnNotifyResetTurnedIntoPowerOff, VERR_INVALID_POINTER);
         AssertReturn(pVmm2UserMethods->u32EndMagic == VMM2USERMETHODS_MAGIC,   VERR_INVALID_PARAMETER);
     }
@@ -842 +843 @@
     AssertLogRelMsgRCReturn(rc, ("Configuration error: Querying \"UUID\" failed, rc=%Rrc\n", rc), rc);
 
+    rc = CFGMR3QueryBoolDef(pRoot, "PowerOffInsteadOfReset", &pVM->vm.s.fPowerOffInsteadOfReset, false);
+    AssertLogRelMsgRCReturn(rc, ("Configuration error: Querying \"PowerOffInsteadOfReset\" failed, rc=%Rrc\n", rc), rc);
+
     return VINF_SUCCESS;
 }
@@ -2853 +2857 @@
     VM_ASSERT_VALID_EXT_RETURN(pVM, VERR_INVALID_VM_HANDLE);
 
+    if (pVM->vm.s.fPowerOffInsteadOfReset)
+    {
+        if (   pUVM->pVmm2UserMethods
+            && pUVM->pVmm2UserMethods->pfnNotifyResetTurnedIntoPowerOff)
+            pUVM->pVmm2UserMethods->pfnNotifyResetTurnedIntoPowerOff(pUVM->pVmm2UserMethods, pUVM);
+        return VMR3PowerOff(pUVM);
+    }
+
     /*
      * Gather all the EMTs to make sure there are no races before
@@ -4437 +4449 @@
 }
 
+
+/**
+ * Control whether the VM should power off when resetting.
+ *
+ * @returns VBox status code.
+ * @param   pUVM                The user mode VM handle.
+ * @param   fPowerOffInsteadOfReset Flag whether the VM should power off when
+ *                                  resetting.
+ */
+VMMR3DECL(int) VMR3SetPowerOffInsteadOfReset(PUVM pUVM, bool fPowerOffInsteadOfReset)
+{
+    UVM_ASSERT_VALID_EXT_RETURN(pUVM, VERR_INVALID_VM_HANDLE);
+    PVM pVM = pUVM->pVM;
+    VM_ASSERT_VALID_EXT_RETURN(pVM, VERR_INVALID_VM_HANDLE);
+
+    /* Note: not called from EMT. */
+    pVM->vm.s.fPowerOffInsteadOfReset = fPowerOffInsteadOfReset;
+    return VINF_SUCCESS;
+}
+

trunk/src/VBox/VMM/include/VMInternal.h

@@ -164 +164 @@
     /** The VM was/is-being teleported and has not yet been fully resumed. */
     bool                            fTeleportedAndNotFullyResumedYet;
+    /** The VM should power off instead of reset. */
+    bool                            fPowerOffInsteadOfReset;
 } VMINT;
 /** Pointer to the VM Internal Data (part of the VM structure). */