Changeset 42779 in vbox

Timestamp:

Aug 11, 2012 10:47:43 PM (12 years ago)

Author:

vboxsync

Message:

EM,TRPM: VINF_SELM_SYNC_GDT fixes.

Location:

trunk/src/VBox/VMM

Files:

• VMMRC/TRPMRCHandlers.cpp (modified) (2 diffs)
• include/EMHandleRCTmpl.h (modified) (1 diff)

trunk/src/VBox/VMM/VMMRC/TRPMRCHandlers.cpp

@@ -1139 +1139 @@
             Assert(TRPMHasTrap(pVCpu));
             /* no break; */
-        case VINF_PGM_SYNC_CR3: /** @todo Check this with Sander. */
+        case VINF_PGM_SYNC_CR3:
         case VINF_EM_RAW_EMULATE_INSTR:
         case VINF_IOM_R3_IOPORT_READ:
@@ -1152 +1152 @@
         case VINF_EM_PENDING_REQUEST:
         case VINF_EM_HALT:
+        case VINF_SELM_SYNC_GDT:
         case VINF_SUCCESS:
             break;

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

@@ -289 +289 @@
          */
         case VINF_SELM_SYNC_GDT:
-            AssertMsg(VMCPU_FF_ISPENDING(pVCpu, VMCPU_FF_SELM_SYNC_GDT), ("VINF_SELM_SYNC_GDT without VMCPU_FF_SELM_SYNC_GDT!\n"));
+            AssertMsg(VMCPU_FF_ISPENDING(pVCpu, VMCPU_FF_SELM_SYNC_GDT | VMCPU_FF_SELM_SYNC_LDT | VMCPU_FF_SELM_SYNC_TSS),
+                      ("VINF_SELM_SYNC_GDT without VMCPU_FF_SELM_SYNC_GDT/LDT/TSS!\n"));
             rc = VINF_SUCCESS;
             break;