Changeset 45105 in vbox

Timestamp:

Mar 20, 2013 2:11:42 PM (12 years ago)

Author:

vboxsync

Message:

VMM/VMMR0: HM bits, fix WinXP booting with unrestricted.

Location:

trunk

Files:

• include/VBox/err.h (modified) (1 diff)
• include/VBox/vmm/hm_vmx.h (modified) (1 diff)
• src/VBox/VMM/VMMR3/HM.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMRZ/VMMRZ.cpp (modified) (1 diff)

trunk/include/VBox/err.h

@@ -1891 +1891 @@
 /** Unexpected interruption exit code. */
 #define VERR_VMX_UNEXPECTED_INTERRUPTION_EXIT_CODE  (-4017)
-/** CPU is not in VMX root mode; unexpected when leaving VMX root mode */
+/** CPU is not in VMX root mode; unexpected when leaving VMX root mode. */
 #define VERR_VMX_NOT_IN_VMX_ROOT_MODE               (-4018)
+/** Undefined VM exit code. */
+#define VERR_VMX_UNDEFINED_EXIT_CODE                (-4019)
 /** @} */
 

trunk/include/VBox/vmm/hm_vmx.h

@@ -537 +537 @@
 /** 7 Interrupt window exiting. */
 #define VMX_EXIT_INT_WINDOW         7
+/** 8 NMI window exiting. */
+#define VMX_EXIT_NMI_WINDOW         8
 /** 9 Task switch. */
 #define VMX_EXIT_TASK_SWITCH        9
 /** 10 Guest software attempted to execute CPUID. */
 #define VMX_EXIT_CPUID              10
+/** 10 Guest software attempted to execute GETSEC. */
+#define VMX_EXIT_GETSEC             11
 /** 12 Guest software attempted to execute HLT. */
 #define VMX_EXIT_HLT                12

trunk/src/VBox/VMM/VMMR3/HM.cpp

@@ -1605 +1605 @@
 
     /* Clear all patch information. */
-    pVM->hm.s.pGuestPatchMem         = 0;
-    pVM->hm.s.pFreeGuestPatchMem     = 0;
-    pVM->hm.s.cbGuestPatchMem        = 0;
+    pVM->hm.s.pGuestPatchMem     = 0;
+    pVM->hm.s.pFreeGuestPatchMem = 0;
+    pVM->hm.s.cbGuestPatchMem    = 0;
     pVM->hm.s.cPatches           = 0;
     pVM->hm.s.PatchTree          = 0;
@@ -1748 +1748 @@
     pVM->hm.s.pFreeGuestPatchMem  = 0;
     pVM->hm.s.cbGuestPatchMem     = 0;
-    pVM->hm.s.fTPRPatchingActive = false;
+    pVM->hm.s.fTPRPatchingActive  = false;
     return VINF_SUCCESS;
 }

trunk/src/VBox/VMM/VMMRZ/VMMRZ.cpp

@@ -189 +189 @@
 VMMRZDECL(int) VMMRZCallRing3SetNotification(PVMCPU pVCpu, R0PTRTYPE(PFNVMMR0CALLRING3NOTIFICATION) pfnCallback, RTR0PTR pvUser)
 {
-    AssertReturn(pVCpu, VERR_INVALID_POINTER);
-    AssertReturn(pfnCallback, VERR_INVALID_POINTER);
+    AssertPtrReturn(pVCpu, VERR_INVALID_POINTER);
+    AssertPtrReturn(pfnCallback, VERR_INVALID_POINTER);
 
     if (pVCpu->vmm.s.pfnCallRing3CallbackR0)