Changeset 104511 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

May 3, 2024 3:03:42 PM (9 months ago)

Author:

vboxsync

Message:

VMM: Some more GCM cleanup. bugref:9735 bugref:10683

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• GCM.cpp (modified) (1 diff)
• HM.cpp (modified) (1 diff)

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

@@ -154 +154 @@
 
 #if 0 /* development override */
-    pVM->gcm.s.enmFixerIds = GCMFIXER_DBZ_OS2 | GCMFIXER_DBZ_DOS | GCMFIXER_DBZ_WIN9X;
+    pVM->gcm.s.fFixerSet = GCMFIXER_DBZ_OS2 | GCMFIXER_DBZ_DOS | GCMFIXER_DBZ_WIN9X;
 #endif
 

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

@@ -754 +754 @@
         PVMCPU pVCpu = pVM->apCpusR3[idCpu];
         pVCpu->hm.s.fActive = false;
-        pVCpu->hm.s.fGIMTrapXcptUD = GIMShouldTrapXcptUD(pVCpu);    /* Is safe to call now since GIMR3Init() has completed. */
-        pVCpu->hm.s.fGCMTrapXcptDE = GCMShouldTrapXcptDE(pVCpu);    /* Is safe to call now since GCMR3Init() has completed. */
+        pVCpu->hm.s.fGIMTrapXcptUD = GIMShouldTrapXcptUD(pVCpu);     /* Is safe to call now since GIMR3Init() has completed. */
+        pVCpu->hm.s.fGCMTrapXcptDE = GCMIsInterceptingXcptDE(pVCpu); /* Is safe to call now since GCMR3Init() has completed. */
     }