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

Timestamp:

Dec 8, 2017 5:58:00 AM (7 years ago)

Author:

vboxsync

Message:

VMM/IEM: Nested hw.virt: Fixed SVM intercept function calls to accomodate the extra parameter.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• IEMAll.cpp (modified) (4 diffs)
• IEMAllCImplSvmInstr.cpp.h (modified) (2 diffs)

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

@@ -419 +419 @@
  * Check if an SVM control/instruction intercept is set.
  */
-# define IEM_IS_SVM_CTRL_INTERCEPT_SET(a_pVCpu, a_Intercept) (CPUMIsGuestSvmCtrlInterceptSet(IEM_GET_CTX(a_pVCpu), (a_Intercept)))
+# define IEM_IS_SVM_CTRL_INTERCEPT_SET(a_pVCpu, a_Intercept) (CPUMIsGuestSvmCtrlInterceptSet(a_pVCpu, IEM_GET_CTX(a_pVCpu), (a_Intercept)))
 
 /**
  * Check if an SVM read CRx intercept is set.
  */
-# define IEM_IS_SVM_READ_CR_INTERCEPT_SET(a_pVCpu, a_uCr)    (CPUMIsGuestSvmReadCRxInterceptSet(IEM_GET_CTX(a_pVCpu), (a_uCr)))
+# define IEM_IS_SVM_READ_CR_INTERCEPT_SET(a_pVCpu, a_uCr)    (CPUMIsGuestSvmReadCRxInterceptSet(a_pVCpu, IEM_GET_CTX(a_pVCpu), (a_uCr)))
 
 /**
  * Check if an SVM write CRx intercept is set.
  */
-# define IEM_IS_SVM_WRITE_CR_INTERCEPT_SET(a_pVCpu, a_uCr)   (CPUMIsGuestSvmWriteCRxInterceptSet(IEM_GET_CTX(a_pVCpu), (a_uCr)))
+# define IEM_IS_SVM_WRITE_CR_INTERCEPT_SET(a_pVCpu, a_uCr)   (CPUMIsGuestSvmWriteCRxInterceptSet(a_pVCpu, IEM_GET_CTX(a_pVCpu), (a_uCr)))
 
 /**
  * Check if an SVM read DRx intercept is set.
  */
-# define IEM_IS_SVM_READ_DR_INTERCEPT_SET(a_pVCpu, a_uDr)    (CPUMIsGuestSvmReadDRxInterceptSet(IEM_GET_CTX(a_pVCpu), (a_uDr)))
+# define IEM_IS_SVM_READ_DR_INTERCEPT_SET(a_pVCpu, a_uDr)    (CPUMIsGuestSvmReadDRxInterceptSet(a_pVCpu, IEM_GET_CTX(a_pVCpu), (a_uDr)))
 
 /**
  * Check if an SVM write DRx intercept is set.
  */
-# define IEM_IS_SVM_WRITE_DR_INTERCEPT_SET(a_pVCpu, a_uDr)   (CPUMIsGuestSvmWriteDRxInterceptSet(IEM_GET_CTX(a_pVCpu), (a_uDr)))
+# define IEM_IS_SVM_WRITE_DR_INTERCEPT_SET(a_pVCpu, a_uDr)   (CPUMIsGuestSvmWriteDRxInterceptSet(a_pVCpu, IEM_GET_CTX(a_pVCpu), (a_uDr)))
 
 /**
  * Check if an SVM exception intercept is set.
  */
-# define IEM_IS_SVM_XCPT_INTERCEPT_SET(a_pVCpu, a_uVector)   (CPUMIsGuestSvmXcptInterceptSet(IEM_GET_CTX(a_pVCpu), (a_uVector)))
+# define IEM_IS_SVM_XCPT_INTERCEPT_SET(a_pVCpu, a_uVector)   (CPUMIsGuestSvmXcptInterceptSet(a_pVCpu, IEM_GET_CTX(a_pVCpu), (a_uVector)))
 
 /**
@@ -13848 +13848 @@
     {
         if (CPUMIsGuestInSvmNestedHwVirtMode(pCtx))
-            fIntrEnabled = CPUMCanSvmNstGstTakePhysIntr(pCtx);
+            fIntrEnabled = CPUMCanSvmNstGstTakePhysIntr(pVCpu, pCtx);
         else
             fIntrEnabled = pOrgCtx->eflags.Bits.u1IF;
@@ -15209 +15209 @@
     {
         if (CPUMIsGuestInSvmNestedHwVirtMode(pCtx))
-            fIntrEnabled = CPUMCanSvmNstGstTakePhysIntr(pCtx);
+            fIntrEnabled = CPUMCanSvmNstGstTakePhysIntr(pVCpu, pCtx);
         else
             fIntrEnabled = pCtx->eflags.Bits.u1IF;
@@ -15275 +15275 @@
     {
         if (CPUMIsGuestInSvmNestedHwVirtMode(pCtx))
-            fIntrEnabled = CPUMCanSvmNstGstTakePhysIntr(pCtx);
+            fIntrEnabled = CPUMCanSvmNstGstTakePhysIntr(pVCpu, pCtx);
         else
             fIntrEnabled = pCtx->eflags.Bits.u1IF;

trunk/src/VBox/VMM/VMMAll/IEMAllCImplSvmInstr.cpp.h

@@ -328 +328 @@
          */
         /* VMRUN must always be intercepted. */
-        if (!CPUMIsGuestSvmCtrlInterceptSet(pCtx, SVM_CTRL_INTERCEPT_VMRUN))
+        if (!CPUMIsGuestSvmCtrlInterceptSet(pVCpu, pCtx, SVM_CTRL_INTERCEPT_VMRUN))
         {
             Log(("iemSvmVmrun: VMRUN instruction not intercepted -> #VMEXIT\n"));
@@ -1002 +1002 @@
      * Check if any MSRs are being intercepted.
      */
-    Assert(CPUMIsGuestSvmCtrlInterceptSet(pCtx, SVM_CTRL_INTERCEPT_MSR_PROT));
+    Assert(CPUMIsGuestSvmCtrlInterceptSet(pVCpu, pCtx, SVM_CTRL_INTERCEPT_MSR_PROT));
     Assert(CPUMIsGuestInSvmNestedHwVirtMode(pCtx));