Changeset 12574 in vbox for trunk/src/VBox/VMM

Timestamp:

Sep 18, 2008 1:12:07 PM (16 years ago)

Author:

vboxsync

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

36792

Message:

APIC: Added helper for calling VMMGetCpuId.

Location:

trunk/src/VBox/VMM

Files:

• PDMDevice.cpp (modified) (3 diffs)
• VMMGC/PDMGCDevice.cpp (modified) (3 diffs)
• VMMR0/PDMR0Device.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/PDMDevice.cpp

@@ -235 +235 @@
 static DECLCALLBACK(int) pdmR3ApicHlp_Lock(PPDMDEVINS pDevIns, int rc);
 static DECLCALLBACK(void) pdmR3ApicHlp_Unlock(PPDMDEVINS pDevIns);
+static DECLCALLBACK(uint32_t) pdmR3ApicHlp_GetCpuId(PPDMDEVINS pDevIns);
 static DECLCALLBACK(PCPDMAPICHLPRC) pdmR3ApicHlp_GetRCHelpers(PPDMDEVINS pDevIns);
 static DECLCALLBACK(PCPDMAPICHLPR0) pdmR3ApicHlp_GetR0Helpers(PPDMDEVINS pDevIns);
@@ -505 +506 @@
     pdmR3ApicHlp_Lock,
     pdmR3ApicHlp_Unlock,
+    pdmR3ApicHlp_GetCpuId,
     pdmR3ApicHlp_GetRCHelpers,
     pdmR3ApicHlp_GetR0Helpers,
@@ -4122 +4124 @@
 
 
+/** @copydoc PDMAPICHLPR3::pfnGetCpuId */
+static DECLCALLBACK(uint32_t) pdmR3ApicHlp_GetCpuId(PPDMDEVINS pDevIns)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    return VMMGetCpuId(pDevIns->Internal.s.pVMHC);
+}
+
+
 /** @copydoc PDMAPICHLPR3::pfnGetRCHelpers */
 static DECLCALLBACK(PCPDMAPICHLPRC) pdmR3ApicHlp_GetRCHelpers(PPDMDEVINS pDevIns)

trunk/src/VBox/VMM/VMMGC/PDMGCDevice.cpp

@@ -104 +104 @@
 static DECLCALLBACK(int) pdmRCApicHlp_Lock(PPDMDEVINS pDevIns, int rc);
 static DECLCALLBACK(void) pdmRCApicHlp_Unlock(PPDMDEVINS pDevIns);
+static DECLCALLBACK(uint32_t) pdmRCApicHlp_GetCpuId(PPDMDEVINS pDevIns);
 /** @} */
 
@@ -176 +177 @@
     pdmRCApicHlp_Lock,
     pdmRCApicHlp_Unlock,
+    pdmRCApicHlp_GetCpuId,
     PDM_APICHLPRC_VERSION
 };
@@ -435 +437 @@
     PDMDEV_ASSERT_DEVINS(pDevIns);
     pdmUnlock(pDevIns->Internal.s.pVMGC);
+}
+
+
+/** @copydoc PDMAPICHLPGC::pfnGetCpuId */
+static DECLCALLBACK(uint32_t) pdmRCApicHlp_GetCpuId(PPDMDEVINS pDevIns)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    return VMMGetCpuId(pDevIns->Internal.s.pVMGC);
 }
 

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

@@ -104 +104 @@
 static DECLCALLBACK(int) pdmR0ApicHlp_Lock(PPDMDEVINS pDevIns, int rc);
 static DECLCALLBACK(void) pdmR0ApicHlp_Unlock(PPDMDEVINS pDevIns);
+static DECLCALLBACK(uint32_t) pdmR0ApicHlp_GetCpuId(PPDMDEVINS pDevIns);
 /** @} */
 
@@ -176 +177 @@
     pdmR0ApicHlp_Lock,
     pdmR0ApicHlp_Unlock,
+    pdmR0ApicHlp_GetCpuId,
     PDM_APICHLPR0_VERSION
 };
@@ -439 +441 @@
     PDMDEV_ASSERT_DEVINS(pDevIns);
     pdmUnlock(pDevIns->Internal.s.pVMHC);
+}
+
+
+/** @copydoc PDMAPICHLPR0::pfnGetCpuId */
+static DECLCALLBACK(uint32_t) pdmR0ApicHlp_GetCpuId(PPDMDEVINS pDevIns)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    return VMMGetCpuId(pDevIns->Internal.s.pVMHC);
 }