Changeset 73282 in vbox for trunk/src/VBox/VMM/VMMAll/NEMAllNativeTemplate-win.cpp.h

Timestamp:

Jul 20, 2018 8:04:26 PM (7 years ago)

Author:

vboxsync

Message:

NEM/win: Kicked out VINF/VERR_NEM_UPDATE_APIC_BASE and VINF/VERR_NEM_CHANGE_PGM_MODE and associated complications. bugref:9044

File:

• trunk/src/VBox/VMM/VMMAll/NEMAllNativeTemplate-win.cpp.h (modified) (4 diffs)

trunk/src/VBox/VMM/VMMAll/NEMAllNativeTemplate-win.cpp.h

@@ -497 +497 @@
         if (rc == VERR_NEM_FLUSH_TLB)
             return PGMFlushTLB(pVCpu, pVCpu->cpum.GstCtx.cr3, true /*fGlobal*/);
-        if (rc == VERR_NEM_CHANGE_PGM_MODE)
-            return PGMChangeMode(pVCpu, pVCpu->cpum.GstCtx.cr0, pVCpu->cpum.GstCtx.cr4, pVCpu->cpum.GstCtx.msrEFER);
         AssertLogRelRCReturn(rc, rc);
         return rc;
@@ -1834 +1832 @@
 #if defined(IN_RING0) && defined(NEM_WIN_TEMPLATE_MODE_OWN_RUN_API)
 /**
- * Wrapper around nemR0WinImportState that converts VERR_NEM_CHANGE_PGM_MODE and
- * VERR_NEM_FLUSH_TBL into informational status codes and logs+asserts statuses.
+ * Wrapper around nemR0WinImportState that converts VERR_NEM_FLUSH_TLB
+ * into informational status codes and logs+asserts statuses.
  *
  * @returns VBox strict status code.
@@ -1853 +1851 @@
     }
 
-    if (rc == VERR_NEM_CHANGE_PGM_MODE || rc == VERR_NEM_FLUSH_TLB || rc == VERR_NEM_UPDATE_APIC_BASE)
+    if (rc == VERR_NEM_FLUSH_TLB)
     {
         Log4(("%s/%u: nemR0WinImportState -> %Rrc\n", pszCaller, pGVCpu->idCpu, -rc));
@@ -4363 +4361 @@
             if (RT_SUCCESS(rc2))
                 pVCpu->cpum.GstCtx.fExtrn &= ~fImport;
-            else if (rc2 == VERR_NEM_CHANGE_PGM_MODE || rc2 == VERR_NEM_FLUSH_TLB || rc2 == VERR_NEM_UPDATE_APIC_BASE)
+            else if (rc2 == VERR_NEM_FLUSH_TLB)
             {
                 pVCpu->cpum.GstCtx.fExtrn &= ~fImport;