vbox的更動 13020 路徑 trunk/src/VBox/VMM/VMMAll/EMAll.cpp

時間撮記:

2008-10-6 下午04:27:16 (16 年 以前)

作者:

vboxsync

訊息:

Knut-compatibility fixes

檔案:

• trunk/src/VBox/VMM/VMMAll/EMAll.cpp (修改) (2 筆差異)

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;