Changeset 97264 in vbox for trunk/src/VBox/VMM/include

Timestamp:

Oct 21, 2022 12:08:51 PM (2 years ago)

Author:

vboxsync

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

154250

Message:

VMM/CPUM: Nested VMX: bugref:10092 Addressed todo regarding keeping extra memebers in VM::CPUM just for passing on VMX features to cpumR3InitVmxGuestFeaturesAndMsrs.

File:

• trunk/src/VBox/VMM/include/CPUMInternal.h (modified) (2 diffs)

trunk/src/VBox/VMM/include/CPUMInternal.h

@@ -377 +377 @@
     uint32_t                u32UnusedOnNonX86;
 #endif
-    /** Nested VMX: Whether to expose VMX-preemption timer to the guest. */
-    bool                    fNestedVmxPreemptTimer;
-    /** Nested VMX: Whether to expose EPT to the guest. If this is disabled make sure
-     *  to also disable fNestedVmxUnrestrictedGuest. */
-    bool                    fNestedVmxEpt;
-    /** Nested VMX: Whether to expose "unrestricted guest" to the guest. */
-    bool                    fNestedVmxUnrestrictedGuest;
-    uint8_t                 abPadding1[1];
+    uint8_t                 abPadding1[4];
 
     /** Random value we store in the reserved RFLAGS bits we don't use ourselves so
@@ -500 +493 @@
 int                 cpumR3DbgInit(PVM pVM);
 int                 cpumR3InitCpuIdAndMsrs(PVM pVM, PCCPUMMSRS pHostMsrs);
-void                cpumR3InitVmxGuestFeaturesAndMsrs(PVM pVM, PCVMXMSRS pHostVmxMsrs, PVMXMSRS pGuestVmxMsrs);
+void                cpumR3InitVmxGuestFeaturesAndMsrs(PVM pVM, PCFGMNODE pCpumCfg, PCVMXMSRS pHostVmxMsrs,
+                                                      PVMXMSRS pGuestVmxMsrs);
 void                cpumR3CpuIdRing3InitDone(PVM pVM);
 void                cpumR3SaveCpuId(PVM pVM, PSSMHANDLE pSSM);