Changeset 68853 in vbox for trunk/src/VBox/VMM/VMMR3/VMEmt.cpp

Timestamp:

Sep 25, 2017 1:10:41 PM (7 years ago)

Author:

vboxsync

Message:

VMMR3EmtRendezvous: Pretend we're a single CPU config when called during vmR3Destroy after the EMTs have started terminating.

File:

• trunk/src/VBox/VMM/VMMR3/VMEmt.cpp (modified) (3 diffs)

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

@@ -94 +94 @@
     Log(("vmR3EmulationThread: Emulation thread starting the days work... Thread=%#x pUVM=%p\n", hThreadSelf, pUVM));
     VMSTATE enmBefore = VMSTATE_CREATED; /* (only used for logging atm.) */
+    ASMAtomicIncU32(&pUVM->vm.s.cActiveEmts);
     for (;;)
     {
@@ -244 +245 @@
 
     } /* forever */
+
+
+    /*
+     * Decrement the active EMT count if we haven't done it yet in vmR3Destroy.
+     */
+    if (!pUVCpu->vm.s.fBeenThruVmDestroy)
+        ASMAtomicDecU32(&pUVM->vm.s.cActiveEmts);
 
 
@@ -1381 +1389 @@
 }
 
+
+/**
+ * Returns the number of active EMTs.
+ *
+ * This is used by the rendezvous code during VM destruction to avoid waiting
+ * for EMTs that aren't around any more.
+ *
+ * @returns Number of active EMTs.  0 if invalid parameter.
+ * @param   pUVM                The user mode VM structure.
+ */
+VMMR3_INT_DECL(uint32_t) VMR3GetActiveEmts(PUVM pUVM)
+{
+    UVM_ASSERT_VALID_EXT_RETURN(pUVM, 0);
+    return pUVM->vm.s.cActiveEmts;
+}
+