Changeset 71910 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Apr 19, 2018 8:54:23 AM (7 years ago)

Author:

vboxsync

Message:

VMM/HM: Clean up and also fix HMR0EnsureCompleteBasicContext for AMD-V which also selectively re-loads guest state back into the VMCB.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• HMAll.cpp (modified) (2 diffs)
• HMSVMAll.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/HMAll.cpp

@@ -543 +543 @@
 {
     pVCpu->hm.s.fGIMTrapXcptUD = true;
-    HMCPU_CF_SET(pVCpu, HM_CHANGED_GUEST_XCPT_INTERCEPTS);
+    HMCPU_CF_SET(pVCpu, HM_CHANGED_VMM_GUEST_XCPT_INTERCEPTS);
 }
 
@@ -555 +555 @@
 {
     pVCpu->hm.s.fGIMTrapXcptUD = false;
-    HMCPU_CF_SET(pVCpu, HM_CHANGED_GUEST_XCPT_INTERCEPTS);
+    HMCPU_CF_SET(pVCpu, HM_CHANGED_VMM_GUEST_XCPT_INTERCEPTS);
 }
 

trunk/src/VBox/VMM/VMMAll/HMSVMAll.cpp

@@ -103 +103 @@
                 int rc2 = APICSetTpr(pVCpu, u8Tpr);
                 AssertRC(rc2);
-                HMCPU_CF_SET(pVCpu, HM_CHANGED_SVM_GUEST_APIC_STATE);
+                HMCPU_CF_SET(pVCpu, HM_CHANGED_GUEST_APIC_STATE);
 
                 pCtx->rip += pPatch->cbOp;