Changeset 13020 in vbox for trunk/src/VBox/Devices/PC

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

37459

Message:

Knut-compatibility fixes

File:

• trunk/src/VBox/Devices/PC/DevAPIC.cpp (modified) (7 diffs)

trunk/src/VBox/Devices/PC/DevAPIC.cpp

@@ -366 +366 @@
                                            uint8_t u8DeliveryMode, uint8_t iVector, uint8_t u8Polarity,
                                            uint8_t u8TriggerMode);
-PDMBOTHCBDECL(uint32_t) apicWRMSR(PPDMDEVINS pDevIns, VMCPUID iCpu, uint32_t u32Reg, uint64_t u64Value);
-PDMBOTHCBDECL(uint32_t) apicRDMSR(PPDMDEVINS pDevIns, VMCPUID iCpu, uint32_t u32Reg, uint64_t *pu64Value);
+PDMBOTHCBDECL(uint32_t) apicWriteMSR(PPDMDEVINS pDevIns, VMCPUID iCpu, uint32_t u32Reg, uint64_t u64Value);
+PDMBOTHCBDECL(uint32_t) apicReadMSR(PPDMDEVINS pDevIns, VMCPUID iCpu, uint32_t u32Reg, uint64_t *pu64Value);
 PDMBOTHCBDECL(int)  ioapicMMIORead(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, void *pv, unsigned cb);
 PDMBOTHCBDECL(int)  ioapicMMIOWrite(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, void *pv, unsigned cb);
@@ -581 +581 @@
 }
 
-PDMBOTHCBDECL(uint32_t) apicWRMSR(PPDMDEVINS pDevIns, VMCPUID iCpu, uint32_t u32Reg, uint64_t u64Value)
-{
+PDMBOTHCBDECL(uint32_t) apicWriteMSR(PPDMDEVINS pDevIns, VMCPUID iCpu, uint32_t u32Reg, uint64_t u64Value)
+{
+    APICDeviceInfo *dev = PDMINS_2_DATA(pDevIns, APICDeviceInfo *);
+    u32Reg -= MSR_IA32_APIC_START;
+    LogRel(("nike: WRMSR on %d: to %x written %llx\n", iCpu, u32Reg, u64Value));
     return 0;
 }
-PDMBOTHCBDECL(uint32_t) apicRDMSR(PPDMDEVINS pDevIns, VMCPUID iCpu, uint32_t u32Reg, uint64_t *pu64Value)
-{
+PDMBOTHCBDECL(uint32_t) apicReadMSR(PPDMDEVINS pDevIns, VMCPUID iCpu, uint32_t u32Reg, uint64_t *pu64Value)
+{
+    APICDeviceInfo *dev = PDMINS_2_DATA(pDevIns, APICDeviceInfo *);
+    u32Reg -= MSR_IA32_APIC_START;
+    LogRel(("nike: RDMSR on %d: read from %x\n", iCpu, u32Reg));
+    *pu64Value = 0;
     return 0;
 }
@@ -1968 +1975 @@
     ApicReg.pfnSetTPRR3             = apicSetTPR;
     ApicReg.pfnGetTPRR3             = apicGetTPR;
-    ApicReg.pfnWRMSRR3              = apicWRMSR;
-    ApicReg.pfnRDMSRR3              = apicRDMSR;
+    ApicReg.pfnWriteMSRR3           = apicWriteMSR;
+    ApicReg.pfnReadMSRR3            = apicReadMSR;
     ApicReg.pfnBusDeliverR3         = apicBusDeliverCallback;
     if (fGCEnabled) {
@@ -1978 +1985 @@
         ApicReg.pszSetTPRRC         = "apicSetTPR";
         ApicReg.pszGetTPRRC         = "apicGetTPR";
-        ApicReg.pszWRMSRRC          = "apicWRMSR";
-        ApicReg.pszRDMSRRC          = "apicRDMSR";
+        ApicReg.pszWriteMSRRC       = "apicWriteMSR";
+        ApicReg.pszReadMSRRC        = "apicReadMSR";
         ApicReg.pszBusDeliverRC     = "apicBusDeliverCallback";
     } else {
@@ -1988 +1995 @@
         ApicReg.pszSetTPRRC         = NULL;
         ApicReg.pszGetTPRRC         = NULL;
-        ApicReg.pszWRMSRRC          = NULL;
-        ApicReg.pszRDMSRRC          = NULL;
+        ApicReg.pszWriteMSRRC       = NULL;
+        ApicReg.pszReadMSRRC        = NULL;
         ApicReg.pszBusDeliverRC     = NULL;
     }
@@ -1999 +2006 @@
         ApicReg.pszSetTPRR0         = "apicSetTPR";
         ApicReg.pszGetTPRR0         = "apicGetTPR";
-        ApicReg.pszWRMSRR0          = "apicWRMSR";
-        ApicReg.pszRDMSRR0          = "apicRDMSR";
+        ApicReg.pszWriteMSRR0       = "apicWriteMSR";
+        ApicReg.pszReadMSRR0        = "apicReadMSR";
         ApicReg.pszBusDeliverR0     = "apicBusDeliverCallback";
     } else {
@@ -2009 +2016 @@
         ApicReg.pszSetTPRR0         = NULL;
         ApicReg.pszGetTPRR0         = NULL;
-        ApicReg.pszWRMSRR0          = NULL;
-        ApicReg.pszRDMSRR0          = NULL;
+        ApicReg.pszWriteMSRR0       = NULL;
+        ApicReg.pszReadMSRR0        = NULL;
         ApicReg.pszBusDeliverR0     = NULL;
     }