Changeset 90982 in vbox

Timestamp:

Aug 29, 2021 12:54:28 PM (3 years ago)

Author:

vboxsync

Message:

VMM: Removed VMMCALLRING3_VM_R0_PREEMPT. bugref:6695

Location:

trunk

Files:

• include/VBox/vmm/vmm.h (modified) (2 diffs)
• src/VBox/VMM/VMMR3/VMM.cpp (modified) (1 diff)

trunk/include/VBox/vmm/vmm.h

@@ -55 +55 @@
     /** Invalid operation.  */
     VMMCALLRING3_INVALID = 0,
-    /** Acquire the critical section specified as argument.  */
-    VMMCALLRING3_PDM_CRIT_SECT_ENTER,
-    /** Acquire the PGM lock. */
-    VMMCALLRING3_PGM_LOCK,
+    /** Signal a ring 0 assertion. */
+    VMMCALLRING3_VM_R0_ASSERTION,
+    /** Set the VM error message. */
+    VMMCALLRING3_VM_SET_ERROR,
+    /** Set the VM runtime error message. */
+    VMMCALLRING3_VM_SET_RUNTIME_ERROR,
     /** Grow the PGM shadow page pool. */
     VMMCALLRING3_PGM_POOL_GROW,
@@ -67 +69 @@
     /** Allocates a large (2MB) page. */
     VMMCALLRING3_PGM_ALLOCATE_LARGE_HANDY_PAGE,
+    /** Acquire the PGM lock. */
+    VMMCALLRING3_PGM_LOCK,
     /** Acquire the MM hypervisor heap lock. */
     VMMCALLRING3_MMHYPER_LOCK,
-    /** Set the VM error message. */
-    VMMCALLRING3_VM_SET_ERROR,
-    /** Set the VM runtime error message. */
-    VMMCALLRING3_VM_SET_RUNTIME_ERROR,
-    /** Signal a ring 0 assertion. */
-    VMMCALLRING3_VM_R0_ASSERTION,
-    /** Ring switch to force preemption.  This is also used by PDMCritSect to
-     *  handle VERR_INTERRUPTED in kernel context. */
-    VMMCALLRING3_VM_R0_PREEMPT,
     /** The usual 32-bit hack. */
     VMMCALLRING3_32BIT_HACK = 0x7fffffff

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

@@ -2592 +2592 @@
             return VERR_VMM_RING0_ASSERTION;
 
-        /*
-         * A forced switch to ring 0 for preemption purposes.
-         */
-        case VMMCALLRING3_VM_R0_PREEMPT:
-            pVCpu->vmm.s.rcCallRing3 = VINF_SUCCESS;
-            break;
-
         default:
             AssertMsgFailed(("enmCallRing3Operation=%d\n", pVCpu->vmm.s.enmCallRing3Operation));