Changeset 70301 in vbox for trunk/src

Timestamp:

Dec 22, 2017 6:06:27 AM (7 years ago)

Author:

vboxsync

Message:

VMM: Updating VMCB layout with the new GUEST_INTERRUPT_MASK field, interrupt shadow bitfield as a consequence.

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/HMSVMR0.cpp (modified) (4 diffs)
• VMMR3/CPUM.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp

@@ -2347 +2347 @@
      * Guest interrupt shadow.
      */
-    if (pVmcb->ctrl.u64IntShadow & SVM_INTERRUPT_SHADOW_ACTIVE)
+    if (pVmcb->ctrl.u1IntShadow)
         EMSetInhibitInterruptsPC(pVCpu, pMixedCtx->rip);
     else if (VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS))
@@ -3495 +3495 @@
      * the nested-guest but execution later continues here with an interrupt shadow active.
      */
-    pVmcb->ctrl.u64IntShadow = !!fIntShadow;
+    pVmcb->ctrl.u1IntShadow = fIntShadow;
 }
 
@@ -3547 +3547 @@
         Log4(("ctrl.IntCtrl.u24Reserved          %#x\n",      pVmcb->ctrl.IntCtrl.n.u24Reserved));
 
-        Log4(("ctrl.u64IntShadow                 %#RX64\n",   pVmcb->ctrl.u64IntShadow));
+        Log4(("ctrl.u1IntShadow                  %#x\n",      pVmcb->ctrl.u1IntShadow));
+        Log4(("ctrl.u1GuestIntMask               %#x\n",      pVmcb->ctrl.u1GuestIntMask));
         Log4(("ctrl.u64ExitCode                  %#RX64\n",   pVmcb->ctrl.u64ExitCode));
         Log4(("ctrl.u64ExitInfo1                 %#RX64\n",   pVmcb->ctrl.u64ExitInfo1));
@@ -3569 +3570 @@
         Log4(("ctrl.u64NestedPagingCR3           %#RX64\n",   pVmcb->ctrl.u64NestedPagingCR3));
 
-        Log4(("ctrl.u1Lbrvirt                    %RTbool\n",  pVmcb->ctrl.u1LbrVirt));
-        Log4(("ctrl.u1VirtVmsaveVmload           %RTbool\n",  pVmcb->ctrl.u1VirtVmsaveVmload));
+        Log4(("ctrl.u1Lbrvirt                    %#x\n",      pVmcb->ctrl.u1LbrVirt));
+        Log4(("ctrl.u1VirtVmsaveVmload           %#x\n",      pVmcb->ctrl.u1VirtVmsaveVmload));
 
         Log4(("guest.CS.u16Sel                   %RTsel\n",   pVmcb->guest.CS.u16Sel));

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

@@ -2243 +2243 @@
     pHlp->pfnPrintf(pHlp, "%s  u1AvicEnable               = %RTbool\n", pszPrefix, pVmcbCtrl->IntCtrl.n.u1AvicEnable);
     pHlp->pfnPrintf(pHlp, "%s  u8VIntrVector              = %#RX8\n",   pszPrefix, pVmcbCtrl->IntCtrl.n.u8VIntrVector);
-    pHlp->pfnPrintf(pHlp, "%su64IntShadow               = %#RX64\n",    pszPrefix, pVmcbCtrl->u64IntShadow);
+    pHlp->pfnPrintf(pHlp, "%su1IntShadow                = %RTbool\n",   pszPrefix, pVmcbCtrl->u1IntShadow);
+    pHlp->pfnPrintf(pHlp, "%su1GuestIntMask             = %RTbool\n",   pszPrefix, pVmcbCtrl->u1GuestIntMask);
     pHlp->pfnPrintf(pHlp, "%su64ExitCode                = %#RX64\n",    pszPrefix, pVmcbCtrl->u64ExitCode);
     pHlp->pfnPrintf(pHlp, "%su64ExitInfo1               = %#RX64\n",    pszPrefix, pVmcbCtrl->u64ExitInfo1);