Changeset 28319 in vbox

Timestamp:

Apr 14, 2010 6:25:23 PM (15 years ago)

Author:

vboxsync

Message:

pdmdev: Made PDMDevHlpVMState available in R0 and RC.

Location:

trunk

Files:

• include/VBox/pdmdev.h (modified) (5 diffs)
• src/VBox/VMM/VMMGC/PDMGCDevice.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR0/PDMR0Device.cpp (modified) (2 diffs)

trunk/include/VBox/pdmdev.h

@@ -3196 +3196 @@
 
     /**
+     * Gets the VM state.
+     *
+     * @returns VM state.
+     * @param   pDevIns             The device instance.
+     * @thread  Any thread (just keep in mind that it's volatile info).
+     */
+    DECLRCCALLBACKMEMBER(VMSTATE, pfnVMState, (PPDMDEVINS pDevIns));
+
+    /**
      * Set the VM error message
      *
@@ -3340 +3349 @@
      */
     DECLR0CALLBACKMEMBER(bool, pfnA20IsEnabled,(PPDMDEVINS pDevIns));
+
+    /**
+     * Gets the VM state.
+     *
+     * @returns VM state.
+     * @param   pDevIns             The device instance.
+     * @thread  Any thread (just keep in mind that it's volatile info).
+     */
+    DECLR0CALLBACKMEMBER(VMSTATE, pfnVMState, (PPDMDEVINS pDevIns));
 
     /**
@@ -3912 +3930 @@
     pDevIns->pHlpR3->pfnMMHeapFree(pDevIns, pv);
 }
+#endif /* IN_RING3 */
 
 /**
@@ -3918 +3937 @@
 DECLINLINE(VMSTATE) PDMDevHlpVMState(PPDMDEVINS pDevIns)
 {
-    return pDevIns->pHlpR3->pfnVMState(pDevIns);
-}
-
+    return pDevIns->CTX_SUFF(pHlp)->pfnVMState(pDevIns);
+}
+
+#ifdef IN_RING3
 /**
  * @copydoc PDMDEVHLPR3::pfnVMTeleportedAndNotFullyResumedYet
@@ -3928 +3948 @@
     return pDevIns->pHlpR3->pfnVMTeleportedAndNotFullyResumedYet(pDevIns);
 }
-
 #endif /* IN_RING3 */
 

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

@@ -160 +160 @@
 
 
+/** @interface_method_impl{PDMDEVHLPRC,pfnVMState} */
+static DECLCALLBACK(VMSTATE) pdmRCDevHlp_VMState(PPDMDEVINS pDevIns)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+
+    VMSTATE enmVMState = pDevIns->Internal.s.pVMRC->enmVMState;
+
+    LogFlow(("pdmRCDevHlp_VMState: caller=%p/%d: returns %d\n", pDevIns, pDevIns->iInstance, enmVMState));
+    return enmVMState;
+}
+
+
 /** @interface_method_impl{PDMDEVHLPRC,pfnVMSetError} */
 static DECLCALLBACK(int) pdmRCDevHlp_VMSetError(PPDMDEVINS pDevIns, int rc, RT_SRC_POS_DECL, const char *pszFormat, ...)
@@ -241 +253 @@
     pdmRCDevHlp_PhysWrite,
     pdmRCDevHlp_A20IsEnabled,
+    pdmRCDevHlp_VMState,
     pdmRCDevHlp_VMSetError,
     pdmRCDevHlp_VMSetErrorV,

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

@@ -162 +162 @@
 
 
+/** @interface_method_impl{PDMDEVHLPR0,pfnVMState} */
+static DECLCALLBACK(VMSTATE) pdmR0DevHlp_VMState(PPDMDEVINS pDevIns)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+
+    VMSTATE enmVMState = pDevIns->Internal.s.pVMR0->enmVMState;
+
+    LogFlow(("pdmR0DevHlp_VMState: caller=%p/%d: returns %d\n", pDevIns, pDevIns->iInstance, enmVMState));
+    return enmVMState;
+}
+
+
 /** @interface_method_impl{PDMDEVHLPR0,pfnVMSetError} */
 static DECLCALLBACK(int) pdmR0DevHlp_VMSetError(PPDMDEVINS pDevIns, int rc, RT_SRC_POS_DECL, const char *pszFormat, ...)
@@ -255 +267 @@
     pdmR0DevHlp_PhysWrite,
     pdmR0DevHlp_A20IsEnabled,
+    pdmR0DevHlp_VMState,
     pdmR0DevHlp_VMSetError,
     pdmR0DevHlp_VMSetErrorV,