Changeset 73395 in vbox for trunk/include/VBox

Timestamp:

Jul 30, 2018 3:19:54 PM (7 years ago)

Author:

vboxsync

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

124013

Message:

VMM, CPUM: Nested VMX: bugref:9180 Implement Cr0Fixed[0|1] and Cr4Fixed[0|1] MSRs, nits.

Location:

trunk/include/VBox/vmm

Files:

• hm.h (modified) (1 diff)
• hm_vmx.h (modified) (1 diff)

trunk/include/VBox/vmm/hm.h

@@ -137 +137 @@
 VMM_INT_DECL(void)              HMHCPagingModeChanged(PVM pVM, PVMCPU pVCpu, PGMMODE enmShadowMode, PGMMODE enmGuestMode);
 VMM_INT_DECL(int)               HMVmxGetHostMsrs(PVM pVM, PVMXMSRS pVmxMsrs);
-#if 0
 VMM_INT_DECL(int)               HMVmxGetHostMsr(PVM pVM, uint32_t idMsr, uint64_t *puValue);
-#endif
 /** @} */
 

trunk/include/VBox/vmm/hm_vmx.h

@@ -2321 +2321 @@
  * @{
  */
-/** @todo declare these with a prefix that immediately identifies that they are
- *        emulated by VirtualBox and not defined by Intel, see @bugref{9180#c6}.
- */
 /** VMCS revision identifier used for emulating VMX (bit 31 MBZ). Bump this
  *  arbitarily chosen identifier if incompatible changes to the layout of our VMCS
  *  structure is done. */
-#define VMX_VMCS_REVISION_ID                                    UINT32_C(0x1d000001)
-AssertCompile(!(VMX_VMCS_REVISION_ID & RT_BIT(31)));
+#define VMX_E_VMCS_REVISION_ID                                  UINT32_C(0x1d000001)
+AssertCompile(!(VMX_E_VMCS_REVISION_ID & RT_BIT(31)));
+
+/** CR0 bits set here must always be set when in VMX operation. */
+#define VMX_E_CR0_FIXED0                                        (X86_CR0_PE | X86_CR0_NE | X86_CR0_PG)
+/** CR4 bits set here must always be set when in VMX operation. */
+#define VMX_E_CR4_FIXED0                                        (X86_CR4_VMXE)
+
 
 /** @} */