Changeset 73114 in vbox

Timestamp:

Jul 13, 2018 8:00:10 AM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

123694

Message:

VMM/HMSVMR0: Build fix.

File:

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

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

@@ -7840 +7840 @@
     HMSVM_VALIDATE_EXIT_HANDLER_PARAMS(pVCpu, pSvmTransient);
 
-#ifdef VBOX_STRICT
-    PCSVMVMCB pVmcbTmp = hmR0SvmGetCurrentVmcb(pVCpu);
-    Assert(pVmcbTmp);
-    Assert(!pVmcbTmp->ctrl.IntCtrl.n.u1VGifEnable);
-    RT_NOREF(pVmcbTmp);
-#endif
+    PCSVMVMCB pVmcb = hmR0SvmGetCurrentVmcb(pVCpu);
+    Assert(pVmcb);
+    Assert(!pVmcb->ctrl.IntCtrl.n.u1VGifEnable);
 
     VBOXSTRICTRC   rcStrict;
@@ -7852 +7849 @@
     if (fSupportsNextRipSave)
     {
-        PCSVMVMCB     pVmcb   = hmR0SvmGetCurrentVmcb(pVCpu);
         uint8_t const cbInstr = pVmcb->ctrl.u64NextRIP - pVCpu->cpum.GstCtx.rip;
         rcStrict = IEMExecDecodedClgi(pVCpu, cbInstr);
@@ -7922 +7918 @@
     HMSVM_VALIDATE_EXIT_HANDLER_PARAMS(pVCpu, pSvmTransient);
 
-#ifdef VBOX_STRICT
     PCSVMVMCB pVmcb = hmR0SvmGetCurrentVmcb(pVCpu);
     Assert(pVmcb);
     Assert(!pVmcb->ctrl.LbrVirt.n.u1VirtVmsaveVmload);
-    RT_NOREF(pVmcb);
-#endif
 
     VBOXSTRICTRC   rcStrict;
@@ -7969 +7962 @@
     HMSVM_VALIDATE_EXIT_HANDLER_PARAMS(pVCpu, pSvmTransient);
 
-#ifdef VBOX_STRICT
     PCSVMVMCB pVmcb = hmR0SvmGetCurrentVmcb(pVCpu);
-    Assert(pVmcb);
     Assert(!pVmcb->ctrl.LbrVirt.n.u1VirtVmsaveVmload);
-    RT_NOREF(pVmcb);
-#endif
+
     VBOXSTRICTRC rcStrict;
     bool const fSupportsNextRipSave = hmR0SvmSupportsNextRipSave(pVCpu);