Changeset 78483 in vbox

Timestamp:

May 13, 2019 10:52:16 AM (6 years ago)

Author:

vboxsync

Message:

VMM: Nested SVM: bugref:7243 Renamed a couple of functions and doxygen to be more consistent.

Location:

trunk

Files:

• include/VBox/vmm/cpum.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/CPUMAllRegs.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMAll/IEMAllCImplSvmInstr.cpp.h (modified) (1 diff)
• src/VBox/VMM/VMMR0/HMSVMR0.cpp (modified) (3 diffs)

trunk/include/VBox/vmm/cpum.h

@@ -1475 +1475 @@
 VMM_INT_DECL(bool)      CPUMGetVmxIoBitmapPermission(void const *pvIoBitmapA, void const *pvIoBitmapB, uint16_t uPort,
                                                      uint8_t cbAccess);
-VMM_INT_DECL(bool)      CPUMIsSvmIoInterceptActive(void *pvIoBitmap, uint16_t u16Port, SVMIOIOTYPE enmIoType, uint8_t cbReg,
-                                                   uint8_t cAddrSizeBits, uint8_t iEffSeg, bool fRep, bool fStrIo,
-                                                   PSVMIOIOEXITINFO pIoExitInfo);
+VMM_INT_DECL(bool)      CPUMIsSvmIoInterceptSet(void *pvIoBitmap, uint16_t u16Port, SVMIOIOTYPE enmIoType, uint8_t cbReg,
+                                                uint8_t cAddrSizeBits, uint8_t iEffSeg, bool fRep, bool fStrIo,
+                                                PSVMIOIOEXITINFO pIoExitInfo);
 VMM_INT_DECL(int)       CPUMGetSvmMsrpmOffsetAndBit(uint32_t idMsr, uint16_t *pbOffMsrpm, uint8_t *puMsrpmBit);
 /** @} */

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

@@ -3304 +3304 @@
 
 /**
- * Determines whether an IOIO intercept is active for the nested-guest or not.
+ * Determines whether the given I/O access should cause a nested-guest \#VMEXIT.
  *
  * @param   pvIoBitmap      Pointer to the nested-guest IO bitmap.
@@ -3317 +3317 @@
  *                          Optional, can be NULL.
  */
-VMM_INT_DECL(bool) CPUMIsSvmIoInterceptActive(void *pvIoBitmap, uint16_t u16Port, SVMIOIOTYPE enmIoType, uint8_t cbReg,
-                                              uint8_t cAddrSizeBits, uint8_t iEffSeg, bool fRep, bool fStrIo,
-                                              PSVMIOIOEXITINFO pIoExitInfo)
+VMM_INT_DECL(bool) CPUMIsSvmIoInterceptSet(void *pvIoBitmap, uint16_t u16Port, SVMIOIOTYPE enmIoType, uint8_t cbReg,
+                                           uint8_t cAddrSizeBits, uint8_t iEffSeg, bool fRep, bool fStrIo,
+                                           PSVMIOIOEXITINFO pIoExitInfo)
 {
     Assert(cAddrSizeBits == 16 || cAddrSizeBits == 32 || cAddrSizeBits == 64);

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

@@ -990 +990 @@
     SVMIOIOEXITINFO IoExitInfo;
     void *pvIoBitmap = pVCpu->cpum.GstCtx.hwvirt.svm.CTX_SUFF(pvIoBitmap);
-    bool const fIntercept = CPUMIsSvmIoInterceptActive(pvIoBitmap, u16Port, enmIoType, cbReg, cAddrSizeBits, iEffSeg, fRep,
-                                                       fStrIo, &IoExitInfo);
+    bool const fIntercept = CPUMIsSvmIoInterceptSet(pvIoBitmap, u16Port, enmIoType, cbReg, cAddrSizeBits, iEffSeg, fRep,
+                                                    fStrIo, &IoExitInfo);
     if (fIntercept)
     {

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

@@ -5130 +5130 @@
 #ifdef VBOX_WITH_NESTED_HWVIRT_SVM
 /**
- * Determines whether an IOIO intercept is active for the nested-guest or not.
+ * Determines whether the given I/O access should cause a nested-guest \#VMEXIT.
  *
  * @param   pvIoBitmap      Pointer to the nested-guest IO bitmap.
  * @param   pIoExitInfo     Pointer to the SVMIOIOEXITINFO.
  */
-static bool hmR0SvmIsIoInterceptActive(void *pvIoBitmap, PSVMIOIOEXITINFO pIoExitInfo)
+static bool hmR0SvmIsIoInterceptSet(void *pvIoBitmap, PSVMIOIOEXITINFO pIoExitInfo)
 {
     const uint16_t    u16Port       = pIoExitInfo->n.u16Port;
@@ -5145 +5145 @@
     const bool        fStrIo        = pIoExitInfo->n.u1Str;
 
-    return CPUMIsSvmIoInterceptActive(pvIoBitmap, u16Port, enmIoType, cbReg, cAddrSizeBits, iEffSeg, fRep, fStrIo,
-                                      NULL /* pIoExitInfo */);
+    return CPUMIsSvmIoInterceptSet(pvIoBitmap, u16Port, enmIoType, cbReg, cAddrSizeBits, iEffSeg, fRep, fStrIo,
+                                   NULL /* pIoExitInfo */);
 }
 
@@ -5274 +5274 @@
                 SVMIOIOEXITINFO IoExitInfo;
                 IoExitInfo.u = pVmcbNstGst->ctrl.u64ExitInfo1;
-                bool const fIntercept = hmR0SvmIsIoInterceptActive(pvIoBitmap, &IoExitInfo);
+                bool const fIntercept = hmR0SvmIsIoInterceptSet(pvIoBitmap, &IoExitInfo);
                 if (fIntercept)
                     NST_GST_VMEXIT_CALL_RET(pVCpu, uExitCode, uExitInfo1, uExitInfo2);