Changeset 15362 in vbox for trunk/src

Timestamp:

Dec 12, 2008 12:49:10 PM (16 years ago)

Author:

vboxsync

Message:

Don't use RTCCUINTREG.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HWSVMR0.cpp (modified) (1 diff)
• HWVMXR0.cpp (modified) (5 diffs)
• HWVMXR0.h (modified) (1 diff)

trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp

@@ -2331 +2331 @@
 {
     int             rc;
-    RTCCUINTREG     uFlags;
+    RTHCUINTREG     uFlags;
 
     /* @todo This code is not guest SMP safe (hyper context) */

trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp

@@ -1586 +1586 @@
 DECLINLINE(int) VMXR0SaveGuestState(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx)
 {
-    RTCCUINTREG val, valShadow;
+    RTGCUINTREG val, valShadow;
     RTGCUINTPTR uInterruptState;
     int         rc;
@@ -1840 +1840 @@
 {
     int         rc = VINF_SUCCESS;
-    RTCCUINTREG val;
-    RTCCUINTREG exitReason, instrError, cbInstr;
+    RTGCUINTREG val;
+    RTGCUINTREG exitReason, instrError, cbInstr;
     RTGCUINTPTR exitQualification;
     RTGCUINTPTR intInfo = 0; /* shut up buggy gcc 4 */
@@ -1861 +1861 @@
 
 #ifdef VBOX_STRICT
-    VMXFlushWriteCache(pVCpu);
-
-    rc = VMXReadVMCS(VMX_VMCS_CTRL_PIN_EXEC_CONTROLS, &val);
-    AssertRC(rc);
-    Log2(("VMX_VMCS_CTRL_PIN_EXEC_CONTROLS = %08x\n", val));
-
-    /* allowed zero */
-    if ((val & pVM->hwaccm.s.vmx.msr.vmx_pin_ctls.n.disallowed0) != pVM->hwaccm.s.vmx.msr.vmx_pin_ctls.n.disallowed0)
-        Log(("Invalid VMX_VMCS_CTRL_PIN_EXEC_CONTROLS: zero\n"));
-
-    /* allowed one */
-    if ((val & ~pVM->hwaccm.s.vmx.msr.vmx_pin_ctls.n.allowed1) != 0)
-        Log(("Invalid VMX_VMCS_CTRL_PIN_EXEC_CONTROLS: one\n"));
-
-    rc = VMXReadVMCS(VMX_VMCS_CTRL_PROC_EXEC_CONTROLS, &val);
-    AssertRC(rc);
-    Log2(("VMX_VMCS_CTRL_PROC_EXEC_CONTROLS = %08x\n", val));
-
-    /* Must be set according to the MSR, but can be cleared in case of EPT. */
-    if (pVM->hwaccm.s.fNestedPaging)
-        val |=   VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_INVLPG_EXIT
-               | VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_CR3_LOAD_EXIT
-               | VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_CR3_STORE_EXIT;
-
-    /* allowed zero */
-    if ((val & pVM->hwaccm.s.vmx.msr.vmx_proc_ctls.n.disallowed0) != pVM->hwaccm.s.vmx.msr.vmx_proc_ctls.n.disallowed0)
-        Log(("Invalid VMX_VMCS_CTRL_PROC_EXEC_CONTROLS: zero\n"));
-
-    /* allowed one */
-    if ((val & ~pVM->hwaccm.s.vmx.msr.vmx_proc_ctls.n.allowed1) != 0)
-        Log(("Invalid VMX_VMCS_CTRL_PROC_EXEC_CONTROLS: one\n"));
-
-    rc = VMXReadVMCS(VMX_VMCS_CTRL_ENTRY_CONTROLS, &val);
-    AssertRC(rc);
-    Log2(("VMX_VMCS_CTRL_ENTRY_CONTROLS = %08x\n", val));
-
-    /* allowed zero */
-    if ((val & pVM->hwaccm.s.vmx.msr.vmx_entry.n.disallowed0) != pVM->hwaccm.s.vmx.msr.vmx_entry.n.disallowed0)
-        Log(("Invalid VMX_VMCS_CTRL_ENTRY_CONTROLS: zero\n"));
-
-    /* allowed one */
-    if ((val & ~pVM->hwaccm.s.vmx.msr.vmx_entry.n.allowed1) != 0)
-        Log(("Invalid VMX_VMCS_CTRL_ENTRY_CONTROLS: one\n"));
-
-    rc = VMXReadVMCS(VMX_VMCS_CTRL_EXIT_CONTROLS, &val);
-    AssertRC(rc);
-    Log2(("VMX_VMCS_CTRL_EXIT_CONTROLS = %08x\n", val));
-
-    /* allowed zero */
-    if ((val & pVM->hwaccm.s.vmx.msr.vmx_exit.n.disallowed0) != pVM->hwaccm.s.vmx.msr.vmx_exit.n.disallowed0)
-        Log(("Invalid VMX_VMCS_CTRL_EXIT_CONTROLS: zero\n"));
-
-    /* allowed one */
-    if ((val & ~pVM->hwaccm.s.vmx.msr.vmx_exit.n.allowed1) != 0)
-        Log(("Invalid VMX_VMCS_CTRL_EXIT_CONTROLS: one\n"));
+    {
+        RTCCUINTREG val;
+        VMXFlushWriteCache(pVCpu);
+
+        rc = VMXReadVMCS(VMX_VMCS_CTRL_PIN_EXEC_CONTROLS, &val);
+        AssertRC(rc);
+        Log2(("VMX_VMCS_CTRL_PIN_EXEC_CONTROLS = %08x\n", val));
+
+        /* allowed zero */
+        if ((val & pVM->hwaccm.s.vmx.msr.vmx_pin_ctls.n.disallowed0) != pVM->hwaccm.s.vmx.msr.vmx_pin_ctls.n.disallowed0)
+            Log(("Invalid VMX_VMCS_CTRL_PIN_EXEC_CONTROLS: zero\n"));
+
+        /* allowed one */
+        if ((val & ~pVM->hwaccm.s.vmx.msr.vmx_pin_ctls.n.allowed1) != 0)
+            Log(("Invalid VMX_VMCS_CTRL_PIN_EXEC_CONTROLS: one\n"));
+
+        rc = VMXReadVMCS(VMX_VMCS_CTRL_PROC_EXEC_CONTROLS, &val);
+        AssertRC(rc);
+        Log2(("VMX_VMCS_CTRL_PROC_EXEC_CONTROLS = %08x\n", val));
+
+        /* Must be set according to the MSR, but can be cleared in case of EPT. */
+        if (pVM->hwaccm.s.fNestedPaging)
+            val |=   VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_INVLPG_EXIT
+                | VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_CR3_LOAD_EXIT
+                | VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_CR3_STORE_EXIT;
+
+        /* allowed zero */
+        if ((val & pVM->hwaccm.s.vmx.msr.vmx_proc_ctls.n.disallowed0) != pVM->hwaccm.s.vmx.msr.vmx_proc_ctls.n.disallowed0)
+            Log(("Invalid VMX_VMCS_CTRL_PROC_EXEC_CONTROLS: zero\n"));
+
+        /* allowed one */
+        if ((val & ~pVM->hwaccm.s.vmx.msr.vmx_proc_ctls.n.allowed1) != 0)
+            Log(("Invalid VMX_VMCS_CTRL_PROC_EXEC_CONTROLS: one\n"));
+
+        rc = VMXReadVMCS(VMX_VMCS_CTRL_ENTRY_CONTROLS, &val);
+        AssertRC(rc);
+        Log2(("VMX_VMCS_CTRL_ENTRY_CONTROLS = %08x\n", val));
+
+        /* allowed zero */
+        if ((val & pVM->hwaccm.s.vmx.msr.vmx_entry.n.disallowed0) != pVM->hwaccm.s.vmx.msr.vmx_entry.n.disallowed0)
+            Log(("Invalid VMX_VMCS_CTRL_ENTRY_CONTROLS: zero\n"));
+
+        /* allowed one */
+        if ((val & ~pVM->hwaccm.s.vmx.msr.vmx_entry.n.allowed1) != 0)
+            Log(("Invalid VMX_VMCS_CTRL_ENTRY_CONTROLS: one\n"));
+
+        rc = VMXReadVMCS(VMX_VMCS_CTRL_EXIT_CONTROLS, &val);
+        AssertRC(rc);
+        Log2(("VMX_VMCS_CTRL_EXIT_CONTROLS = %08x\n", val));
+
+        /* allowed zero */
+        if ((val & pVM->hwaccm.s.vmx.msr.vmx_exit.n.disallowed0) != pVM->hwaccm.s.vmx.msr.vmx_exit.n.disallowed0)
+            Log(("Invalid VMX_VMCS_CTRL_EXIT_CONTROLS: zero\n"));
+
+        /* allowed one */
+        if ((val & ~pVM->hwaccm.s.vmx.msr.vmx_exit.n.allowed1) != 0)
+            Log(("Invalid VMX_VMCS_CTRL_EXIT_CONTROLS: one\n"));
+    }
 #endif
 
@@ -3068 +3071 @@
     {
 #ifdef VBOX_STRICT
+        RTCCUINTREG val;
+
         Log(("VMX_EXIT_ERR_INVALID_GUEST_STATE\n"));
 
@@ -3534 +3539 @@
 {
     int             rc, rc2;
-    RTCCUINTREG     uFlags;
+    RTHCUINTREG     uFlags;
     PHWACCM_CPUINFO pCpu;
     RTHCPHYS        pPageCpuPhys;

trunk/src/VBox/VMM/VMMR0/HWVMXR0.h

@@ -325 +325 @@
  * @param   pVal        Value
  */
-DECLINLINE(int) VMXReadCachedVMCSEx(PVMCPU pVCpu, uint32_t idxCache, RTCCUINTREG *pVal)
+DECLINLINE(int) VMXReadCachedVMCSEx(PVMCPU pVCpu, uint32_t idxCache, RTGCUINTREG *pVal)
 {
     Assert(idxCache <= VMX_VMCS_MAX_NESTED_PAGING_CACHE_IDX);