Changeset 97262 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Oct 21, 2022 8:10:15 AM (2 years ago)

Author:

vboxsync

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

154248

Message:

VMM: Nested VMX: bugref:10092 Added fetching VM-exit secondary MSR from the support driver. Updated the virtual VMCS with latest VMCS fields (HLAT prefix size, HLAT ptr, secondary VM-exit controls and PCONFIG-exiting bitmap).

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPDrv.cpp (modified) (1 diff)
• SUPDrvIOC.h (modified) (1 diff)
• SUPLib.cpp (modified) (1 diff)

trunk/src/VBox/HostDrivers/Support/SUPDrv.cpp

@@ -4855 +4855 @@
             if (Msrs.u.vmx.ProcCtls.n.allowed1 & VMX_PROC_CTLS_USE_TERTIARY_CTLS)
                 Msrs.u.vmx.u64ProcCtls3 = ASMRdMsr(MSR_IA32_VMX_PROCBASED_CTLS3);
+
+            if (Msrs.u.vmx.ExitCtls.n.allowed1 & VMX_EXIT_CTLS_USE_SECONDARY_CTLS)
+                Msrs.u.vmx.u64ExitCtls2 = ASMRdMsr(MSR_IA32_VMX_EXIT_CTLS2);
         }
         else if (fCaps & SUPVTCAPS_AMD_V)

trunk/src/VBox/HostDrivers/Support/SUPDrvIOC.h

@@ -233 +233 @@
  *          - nothing
  */
-#define SUPDRV_IOC_VERSION                              0x00330003
+#define SUPDRV_IOC_VERSION                              0x00330004
 
 /** SUP_IOCTL_COOKIE. */

trunk/src/VBox/HostDrivers/Support/SUPLib.cpp

@@ -299 +299 @@
         CookieReq.u.In.u32ReqVersion = SUPDRV_IOC_VERSION;
         const uint32_t uMinVersion = (SUPDRV_IOC_VERSION & 0xffff0000) == 0x00330000
-                                   ? 0x00330003
+                                   ? 0x00330004
                                    : SUPDRV_IOC_VERSION & 0xffff0000;
         CookieReq.u.In.u32MinVersion = uMinVersion;