Changeset 14580 in vbox

Timestamp:

Nov 25, 2008 4:03:04 PM (16 years ago)

Author:

vboxsync

Message:

Some updates

Location:

trunk

Files:

• include/VBox/hwacc_vmx.h (modified) (3 diffs)
• src/VBox/VMM/VMMR0/HWSVMR0.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR0/HWVMXR0.cpp (modified) (5 diffs)

trunk/include/VBox/hwacc_vmx.h

@@ -886 +886 @@
  * @{
  */
-#define VMX_VMCS_RO_VM_INSTR_ERROR                              0x4400
-#define VMX_VMCS_RO_EXIT_REASON                                 0x4402
-#define VMX_VMCS_RO_EXIT_INTERRUPTION_INFO                      0x4404
-#define VMX_VMCS_RO_EXIT_INTERRUPTION_ERRCODE                   0x4406
-#define VMX_VMCS_RO_IDT_INFO                                    0x4408
-#define VMX_VMCS_RO_IDT_ERRCODE                                 0x440A
-#define VMX_VMCS_RO_EXIT_INSTR_LENGTH                           0x440C
-#define VMX_VMCS_RO_EXIT_INSTR_INFO                             0x440E
+#define VMX_VMCS32_RO_VM_INSTR_ERROR                              0x4400
+#define VMX_VMCS32_RO_EXIT_REASON                                 0x4402
+#define VMX_VMCS32_RO_EXIT_INTERRUPTION_INFO                      0x4404
+#define VMX_VMCS32_RO_EXIT_INTERRUPTION_ERRCODE                   0x4406
+#define VMX_VMCS32_RO_IDT_INFO                                    0x4408
+#define VMX_VMCS32_RO_IDT_ERRCODE                                 0x440A
+#define VMX_VMCS32_RO_EXIT_INSTR_LENGTH                           0x440C
+#define VMX_VMCS32_RO_EXIT_INSTR_INFO                             0x440E
 /** @} */
 
@@ -1543 +1543 @@
 #if HC_ARCH_BITS == 64
     uint64_t uLastError = 0;
-    int rc = VMXReadVMCS(VMX_VMCS_RO_VM_INSTR_ERROR, &uLastError);
+    int rc = VMXReadVMCS(VMX_VMCS32_RO_VM_INSTR_ERROR, &uLastError);
     AssertRC(rc);
     return (uint32_t)uLastError;
@@ -1549 +1549 @@
 #else /* 32-bit host: */
     uint32_t uLastError = 0;
-    int rc = VMXReadVMCS32(VMX_VMCS_RO_VM_INSTR_ERROR, &uLastError);
+    int rc = VMXReadVMCS32(VMX_VMCS32_RO_VM_INSTR_ERROR, &uLastError);
     AssertRC(rc);
     return uLastError;

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

@@ -2266 +2266 @@
 }
 
-#ifdef HC_ARCH_BITS == 32
+#if HC_ARCH_BITS == 32
 /**
  * Prepares for and executes VMRUN (64 bits guests from a 32 bits hosts).

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

@@ -66 +66 @@
         RTCCUINTREG instrError;
 
-        VMXReadVMCS(VMX_VMCS_RO_VM_INSTR_ERROR, &instrError);
+        VMXReadVMCS(VMX_VMCS32_RO_VM_INSTR_ERROR, &instrError);
         pVCpu->hwaccm.s.vmx.lasterror.ulInstrError = instrError;
     }
@@ -1993 +1993 @@
 
     /* Investigate why there was a VM-exit. */
-    rc  = VMXReadVMCS(VMX_VMCS_RO_EXIT_REASON, &exitReason);
+    rc  = VMXReadVMCS(VMX_VMCS32_RO_EXIT_REASON, &exitReason);
     STAM_COUNTER_INC(&pVCpu->hwaccm.s.paStatExitReasonR0[exitReason & MASK_EXITREASON_STAT]);
 
     exitReason &= 0xffff;   /* bit 0-15 contain the exit code. */
-    rc |= VMXReadVMCS(VMX_VMCS_RO_VM_INSTR_ERROR, &instrError);
-    rc |= VMXReadVMCS(VMX_VMCS_RO_EXIT_INSTR_LENGTH, &cbInstr);
-    rc |= VMXReadVMCS(VMX_VMCS_RO_EXIT_INTERRUPTION_INFO, &val);
+    rc |= VMXReadVMCS(VMX_VMCS32_RO_VM_INSTR_ERROR, &instrError);
+    rc |= VMXReadVMCS(VMX_VMCS32_RO_EXIT_INSTR_LENGTH, &cbInstr);
+    rc |= VMXReadVMCS(VMX_VMCS32_RO_EXIT_INTERRUPTION_INFO, &val);
     intInfo   = val;
-    rc |= VMXReadVMCS(VMX_VMCS_RO_EXIT_INTERRUPTION_ERRCODE, &val);
+    rc |= VMXReadVMCS(VMX_VMCS32_RO_EXIT_INTERRUPTION_ERRCODE, &val);
     errCode   = val;    /* might not be valid; depends on VMX_EXIT_INTERRUPTION_INFO_ERROR_CODE_IS_VALID. */
-    rc |= VMXReadVMCS(VMX_VMCS_RO_EXIT_INSTR_INFO, &val);
+    rc |= VMXReadVMCS(VMX_VMCS32_RO_EXIT_INSTR_INFO, &val);
     instrInfo = val;
     rc |= VMXReadVMCS(VMX_VMCS_RO_EXIT_QUALIFICATION, &val);
@@ -2017 +2017 @@
 
     /* Check if an injected event was interrupted prematurely. */
-    rc = VMXReadVMCS(VMX_VMCS_RO_IDT_INFO,            &val);
+    rc = VMXReadVMCS(VMX_VMCS32_RO_IDT_INFO,            &val);
     AssertRC(rc);
     pVCpu->hwaccm.s.Event.intInfo = VMX_VMCS_CTRL_ENTRY_IRQ_INFO_FROM_EXIT_INT_INFO(val);
@@ -2030 +2030 @@
         if (VMX_EXIT_INTERRUPTION_INFO_ERROR_CODE_IS_VALID(pVCpu->hwaccm.s.Event.intInfo))
         {
-            rc = VMXReadVMCS(VMX_VMCS_RO_IDT_ERRCODE, &val);
+            rc = VMXReadVMCS(VMX_VMCS32_RO_IDT_ERRCODE, &val);
             AssertRC(rc);
             pVCpu->hwaccm.s.Event.errCode  = val;
@@ -3215 +3215 @@
         RTCCUINTREG exitReason, instrError, val;
 
-        rc  = VMXReadVMCS(VMX_VMCS_RO_EXIT_REASON, &exitReason);
-        rc |= VMXReadVMCS(VMX_VMCS_RO_VM_INSTR_ERROR, &instrError);
+        rc  = VMXReadVMCS(VMX_VMCS32_RO_EXIT_REASON, &exitReason);
+        rc |= VMXReadVMCS(VMX_VMCS32_RO_VM_INSTR_ERROR, &instrError);
         AssertRC(rc);
         if (rc == VINF_SUCCESS)