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

Timestamp:

Sep 16, 2021 10:04:16 PM (4 years ago)

Author:

vboxsync

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

146951

Message:

VMM/CPUM,++: Moved the nested SVM I/O permission bitmap allocation into CPUMCTX. bugref:10093

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllCImplSvmInstr.cpp.h (modified) (2 diffs)

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

@@ -563 +563 @@
          * Copy the IO permission bitmap into the cache.
          */
-        Assert(pVCpu->cpum.GstCtx.hwvirt.svm.CTX_SUFF(pvIoBitmap));
-        rc = PGMPhysSimpleReadGCPhys(pVM, pVCpu->cpum.GstCtx.hwvirt.svm.CTX_SUFF(pvIoBitmap), GCPhysIOBitmap,
-                                     SVM_IOPM_PAGES * X86_PAGE_4K_SIZE);
+        AssertCompile(sizeof(pVCpu->cpum.GstCtx.hwvirt.svm.abIoBitmap) == SVM_IOPM_PAGES * X86_PAGE_4K_SIZE);
+        rc = PGMPhysSimpleReadGCPhys(pVM, pVCpu->cpum.GstCtx.hwvirt.svm.abIoBitmap, GCPhysIOBitmap,
+                                     sizeof(pVCpu->cpum.GstCtx.hwvirt.svm.abIoBitmap));
         if (RT_FAILURE(rc))
         {
@@ -989 +989 @@
 
     SVMIOIOEXITINFO IoExitInfo;
-    void *pvIoBitmap = pVCpu->cpum.GstCtx.hwvirt.svm.CTX_SUFF(pvIoBitmap);
-    bool const fIntercept = CPUMIsSvmIoInterceptSet(pvIoBitmap, u16Port, enmIoType, cbReg, cAddrSizeBits, iEffSeg, fRep,
-                                                    fStrIo, &IoExitInfo);
+    bool const fIntercept = CPUMIsSvmIoInterceptSet(pVCpu->cpum.GstCtx.hwvirt.svm.abMsrBitmap, u16Port, enmIoType, cbReg,
+                                                    cAddrSizeBits, iEffSeg, fRep, fStrIo, &IoExitInfo);
     if (fIntercept)
     {