Changeset 70732 in vbox for trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp

Timestamp:

Jan 25, 2018 4:50:36 AM (7 years ago)

Author:

vboxsync

Message:

VMM: Move fGif out of svm and into common nested hwvirt struct.

File:

• trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp (modified) (5 diffs)

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

@@ -2234 +2234 @@
     {
         Assert(pVM->hm.s.svm.fVGif);
-        pVmcb->ctrl.IntCtrl.n.u1VGif = pCtx->hwvirt.svm.fGif;
+        pVmcb->ctrl.IntCtrl.n.u1VGif = pCtx->hwvirt.fGif;
     }
 #endif
@@ -2528 +2528 @@
     {
         Assert(pVCpu->CTX_SUFF(pVM)->hm.s.svm.fVGif);
-        pMixedCtx->hwvirt.svm.fGif = pVmcb->ctrl.IntCtrl.n.u1VGif;
+        pMixedCtx->hwvirt.fGif = pVmcb->ctrl.IntCtrl.n.u1VGif;
     }
 #endif
@@ -3408 +3408 @@
     Assert(!pVCpu->hm.s.Event.fPending);
 
-    bool const fGif = pCtx->hwvirt.svm.fGif;
+    bool const fGif = pCtx->hwvirt.fGif;
     if (fGif)
     {
@@ -3538 +3538 @@
 
 #ifdef VBOX_WITH_NESTED_HWVIRT
-    bool const fGif = pCtx->hwvirt.svm.fGif;
+    bool const fGif = pCtx->hwvirt.fGif;
 #else
     bool const fGif = true;
@@ -3637 +3637 @@
     bool const fIntShadow = hmR0SvmIsIntrShadowActive(pVCpu, pCtx);
 #ifdef VBOX_STRICT
-    bool const fGif       = pCtx->hwvirt.svm.fGif;
+    bool const fGif       = pCtx->hwvirt.fGif;
     bool       fAllowInt  = fGif;
     if (fGif)