Changeset 13020 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Oct 6, 2008 4:27:16 PM (16 years ago)

Author:

vboxsync

Message:

Knut-compatibility fixes

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• EMAll.cpp (modified) (2 diffs)
• PDMAll.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMAll/EMAll.cpp

@@ -2579 +2579 @@
         /* In X2APIC specification this range is reserved for APIC control. */ 
         if ((pRegFrame->ecx >= MSR_IA32_APIC_START) && (pRegFrame->ecx < MSR_IA32_APIC_END))
-        {
-            rc = PDMApicRDMSR(pVM, VMMGetCpuId(pVM), pRegFrame->ecx, &val);
-        } 
+            rc = PDMApicReadMSR(pVM, VMMGetCpuId(pVM), pRegFrame->ecx, &val);
         else 
-        {
             /* We should actually trigger a #GP here, but don't as that might cause more trouble. */
             val = 0;
-            break;
-        }
+        break;
     }
     Log(("EMInterpretRdmsr %s (%x) -> val=%VX64\n", emMSRtoString(pRegFrame->ecx), pRegFrame->ecx, val));
@@ -2728 +2724 @@
         /* In X2APIC specification this range is reserved for APIC control. */ 
         if ((pRegFrame->ecx >=  MSR_IA32_APIC_START) && (pRegFrame->ecx <  MSR_IA32_APIC_END))
-        {
-            return PDMApicWRMSR(pVM, VMMGetCpuId(pVM), pRegFrame->ecx, val);
-        }
+            return PDMApicWriteMSR(pVM, VMMGetCpuId(pVM), pRegFrame->ecx, val);
+
         /* We should actually trigger a #GP here, but don't as that might cause more trouble. */
         break;

trunk/src/VBox/VMM/VMMAll/PDMAll.cpp

@@ -254 +254 @@
 
 /**
- * WRMSR in APIC range.
+ * Write MSR in APIC range.
  *
  * @returns VBox status code.
@@ -262 +262 @@
  * @param   u64Value        Value to write.
  */
-VMMDECL(int) PDMApicWRMSR(PVM pVM, VMCPUID iCpu, uint32_t u32Reg, uint64_t u64Value)
-{
-    if (pVM->pdm.s.Apic.CTX_SUFF(pDevIns))
-    {
-        Assert(pVM->pdm.s.Apic.CTX_SUFF(pfnWRMSR));
-        pdmLock(pVM);
-        pVM->pdm.s.Apic.CTX_SUFF(pfnWRMSR)(pVM->pdm.s.Apic.CTX_SUFF(pDevIns), iCpu, u32Reg, u64Value);
-        pdmUnlock(pVM);
-        return VINF_SUCCESS;
-    }
-    return VERR_PDM_NO_APIC_INSTANCE;
-}
-
-/**
- * RDMSR in APIC range.
+VMMDECL(int) PDMApicWriteMSR(PVM pVM, VMCPUID iCpu, uint32_t u32Reg, uint64_t u64Value)
+{
+    if (pVM->pdm.s.Apic.CTX_SUFF(pDevIns))
+    {
+        Assert(pVM->pdm.s.Apic.CTX_SUFF(pfnWriteMSR));
+        pdmLock(pVM);
+        pVM->pdm.s.Apic.CTX_SUFF(pfnWriteMSR)(pVM->pdm.s.Apic.CTX_SUFF(pDevIns), iCpu, u32Reg, u64Value);
+        pdmUnlock(pVM);
+        return VINF_SUCCESS;
+    }
+    return VERR_PDM_NO_APIC_INSTANCE;
+}
+
+/**
+ * Read MSR in APIC range.
  *
  * @returns VBox status code.
@@ -284 +284 @@
  * @param   pu64Value       Value read.
  */
-VMMDECL(int) PDMApicRDMSR(PVM pVM, VMCPUID iCpu, uint32_t u32Reg, uint64_t *pu64Value)
-{
-    if (pVM->pdm.s.Apic.CTX_SUFF(pDevIns))
-    {
-        Assert(pVM->pdm.s.Apic.CTX_SUFF(pfnRDMSR));
-        pdmLock(pVM);
-        pVM->pdm.s.Apic.CTX_SUFF(pfnRDMSR)(pVM->pdm.s.Apic.CTX_SUFF(pDevIns), iCpu, u32Reg, pu64Value);
+VMMDECL(int) PDMApicReadMSR(PVM pVM, VMCPUID iCpu, uint32_t u32Reg, uint64_t *pu64Value)
+{
+    if (pVM->pdm.s.Apic.CTX_SUFF(pDevIns))
+    {
+        Assert(pVM->pdm.s.Apic.CTX_SUFF(pfnReadMSR));
+        pdmLock(pVM);
+        pVM->pdm.s.Apic.CTX_SUFF(pfnReadMSR)(pVM->pdm.s.Apic.CTX_SUFF(pDevIns), iCpu, u32Reg, pu64Value);
         pdmUnlock(pVM);
         return VINF_SUCCESS;