Changeset 7768 in vbox

Timestamp:

Apr 7, 2008 1:22:40 PM (17 years ago)

Author:

vboxsync

Message:

Added a VMState dev/usb/drvhlp.

Location:

trunk

Files:

• include/VBox/pdmdev.h (modified) (3 diffs)
• include/VBox/pdmdrv.h (modified) (4 diffs)
• include/VBox/pdmusb.h (modified) (3 diffs)
• src/VBox/VMM/PDMDevice.cpp (modified) (6 diffs)
• src/VBox/VMM/PDMDriver.cpp (modified) (4 diffs)

trunk/include/VBox/pdmdev.h

@@ -2228 +2228 @@
     DECLR3CALLBACKMEMBER(int, pfnPhysGCPtr2GCPhys, (PPDMDEVINS pDevIns, RTGCPTR GCPtr, PRTGCPHYS pGCPhys));
 
+    /**
+     * Gets the VM state.
+     *
+     * @returns VM state.
+     * @param   pDevIns         The device instance.
+     * @thread  Any thread (just keep in mind that it's volatile info).
+     */
+    DECLR3CALLBACKMEMBER(VMSTATE, pfnVMState, (PPDMDEVINS pDevIns));
+
     /** Space reserved for future members.
      * @{ */
-    DECLR3CALLBACKMEMBER(void, pfnReserved3,(void));
     DECLR3CALLBACKMEMBER(void, pfnReserved4,(void));
     DECLR3CALLBACKMEMBER(void, pfnReserved5,(void));
@@ -2671 +2679 @@
 
 /** Current PDMDEVHLP version number. */
-#define PDM_DEVHLP_VERSION  0xf2050001
+#define PDM_DEVHLP_VERSION  0xf2050002
 
 
@@ -3354 +3362 @@
 
 /**
+ * @copydoc PDMDEVHLP::pfnVMState
+ */
+DECLINLINE(VMSTATE) PDMDevHlpVMState(PPDMDEVINS pDevIns)
+{
+    return pDevIns->pDevHlp->pfnVMState(pDevIns);
+}
+
+/**
  * @copydoc PDMDEVHLP::pfnA20Set
  */

trunk/include/VBox/pdmdrv.h

@@ -655 +655 @@
     DECLR3CALLBACKMEMBER(int, pfnPDMThreadCreate,(PPDMDRVINS pDrvIns, PPPDMTHREAD ppThread, void *pvUser, PFNPDMTHREADDRV pfnThread,
                                                   PFNPDMTHREADWAKEUPDRV pfnWakeup, size_t cbStack, RTTHREADTYPE enmType, const char *pszName));
+
+    /**
+     * Gets the VM state.
+     *
+     * @returns VM state.
+     * @param   pDrvIns         The driver instance.
+     * @thread  Any thread (just keep in mind that it's volatile info).
+     */
+    DECLR3CALLBACKMEMBER(VMSTATE, pfnVMState, (PPDMDRVINS pDrvIns));
+
 #ifdef VBOX_WITH_PDM_ASYNC_COMPLETION
     /**
@@ -667 +677 @@
      * @param   pszDesc         Description.
      */
-    DECLR3CALLBACKMEMBER(int, pfnPDMAsyncCompletionTemplateCreate,(PPDMDRVINS pDrvIns, PPPDMASYNCCOMPLETIONTEMPLATE ppTemplate, 
+    DECLR3CALLBACKMEMBER(int, pfnPDMAsyncCompletionTemplateCreate,(PPDMDRVINS pDrvIns, PPPDMASYNCCOMPLETIONTEMPLATE ppTemplate,
                                                                    PFNPDMASYNCCOMPLETEDRV pfnCompleted, const char *pszDesc));
 #endif
@@ -680 +690 @@
 
 /** Current DRVHLP version number. */
-#define PDM_DRVHLP_VERSION  0x90020000
+#define PDM_DRVHLP_VERSION  0x90020001
 
 
@@ -828 +838 @@
 }
 
+/**
+ * @copydoc PDMDRVHLP::pfnVMState
+ */
+DECLINLINE(VMSTATE) PDMDrvHlpVMState(PPDMDRVINS pDrvIns)
+{
+    return pDrvIns->pDrvHlp->pfnVMState(pDrvIns);
+}
+
 #ifdef VBOX_WITH_PDM_ASYNC_COMPLETION
 /**
  * @copydoc PDMDRVHLP::pfnPDMAsyncCompletionTemplateCreate
  */
-DECLINLINE(int) PDMDrvHlpPDMAsyncCompletionTemplateCreate(PPDMDRVINS pDrvIns, PPPDMASYNCCOMPLETIONTEMPLATE ppTemplate, 
+DECLINLINE(int) PDMDrvHlpPDMAsyncCompletionTemplateCreate(PPDMDRVINS pDrvIns, PPPDMASYNCCOMPLETIONTEMPLATE ppTemplate,
                                                           PFNPDMASYNCCOMPLETEDRV pfnCompleted, const char *pszDesc)
 {

trunk/include/VBox/pdmusb.h

@@ -558 +558 @@
     DECLR3CALLBACKMEMBER(int, pfnVMSetRuntimeErrorV,(PPDMUSBINS pUsbIns, bool fFatal, const char *pszErrorID, const char *pszFormat, va_list va));
 
+    /**
+     * Gets the VM state.
+     *
+     * @returns VM state.
+     * @param   pUsbIns             The USB device instance.
+     * @thread  Any thread (just keep in mind that it's volatile info).
+     */
+    DECLR3CALLBACKMEMBER(VMSTATE, pfnVMState, (PPDMUSBINS pUsbIns));
+
     /** Just a safety precaution. */
     uint32_t                        u32TheEnd;
@@ -567 +576 @@
 
 /** Current USBHLP version number. */
-#define PDM_USBHLP_VERSION  0xec020000
+#define PDM_USBHLP_VERSION  0xec020001
 
 #endif /* IN_RING3 */
@@ -684 +693 @@
 }
 
-
-/* inline wrappers */
-
-#endif
+/**
+ * @copydoc PDMUSBHLP::pfnVMState
+ */
+DECLINLINE(VMSTATE) PDMUsbHlpVMState(PPDMUSBINS pUsbIns)
+{
+    return pUsbIns->pUsbHlp->pfnVMState(pUsbIns);
+}
+
+#endif /* IN_RING3 */
 
 

trunk/src/VBox/VMM/PDMDevice.cpp

@@ -144 +144 @@
 static DECLCALLBACK(int) pdmR3DevHlp_PhysReserve(PPDMDEVINS pDevIns, RTGCPHYS GCPhys, RTUINT cbRange, const char *pszDesc);
 static DECLCALLBACK(int) pdmR3DevHlp_PhysGCPtr2GCPhys(PPDMDEVINS pDevIns, RTGCPTR GCPtr, PRTGCPHYS pGCPhys);
+static DECLCALLBACK(VMSTATE) pdmR3DevHlp_VMState(PPDMDEVINS pDevIns);
 static DECLCALLBACK(bool) pdmR3DevHlp_A20IsEnabled(PPDMDEVINS pDevIns);
 static DECLCALLBACK(void) pdmR3DevHlp_A20Set(PPDMDEVINS pDevIns, bool fEnable);
@@ -268 +269 @@
 
 /** @def PDMDEV_ASSERT_DEVINS
- * Asserts the validity of the driver instance.
+ * Asserts the validity of the device instance.
  */
 #ifdef VBOX_STRICT
-# define PDMDEV_ASSERT_DEVINS(pDevIns)   do { Assert(pDevIns); Assert(pDevIns->u32Version == PDM_DEVINS_VERSION); Assert(pDevIns->pvInstanceDataR3 == (void *)&pDevIns->achInstanceData[0]); } while (0)
+# define PDMDEV_ASSERT_DEVINS(pDevIns)   \
+    do { \
+        AssertPtr(pDevIns); \
+        Assert(pDevIns->u32Version == PDM_DEVINS_VERSION); \
+        Assert(pDevIns->pvInstanceDataR3 == (void *)&pDevIns->achInstanceData[0]); \
+    } while (0)
 #else
 # define PDMDEV_ASSERT_DEVINS(pDevIns)   do { } while (0)
@@ -334 +340 @@
     pdmR3DevHlp_PDMThreadCreate,
     pdmR3DevHlp_PhysGCPtr2GCPhys,
-    0,
+    pdmR3DevHlp_VMState,
     0,
     0,
@@ -428 +434 @@
     pdmR3DevHlp_PDMThreadCreate,
     pdmR3DevHlp_PhysGCPtr2GCPhys,
-    0,
+    pdmR3DevHlp_VMState,
     0,
     0,
@@ -3285 +3291 @@
 }
 
+
 /** @copydoc PDMDEVHLP::pfnPhysGCPtr2GCPhys */
 static DECLCALLBACK(int) pdmR3DevHlp_PhysGCPtr2GCPhys(PPDMDEVINS pDevIns, RTGCPTR GCPtr, PRTGCPHYS pGCPhys)
@@ -3302 +3309 @@
 
     return rc;
+}
+
+
+/** @copydoc PDMDEVHLP::pfnVMState */
+static DECLCALLBACK(VMSTATE) pdmR3DevHlp_VMState(PPDMDEVINS pDevIns)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+
+    VMSTATE enmVMState = VMR3GetState(pDevIns->Internal.s.pVMHC);
+
+    LogFlow(("pdmR3DevHlp_VMState: caller='%s'/%d: returns %d (%s)\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance,
+             enmVMState, VMR3GetStateName(enmVMState)));
+    return enmVMState;
 }
 

trunk/src/VBox/VMM/PDMDriver.cpp

@@ -93 +93 @@
 static DECLCALLBACK(int) pdmR3DrvHlp_PDMThreadCreate(PPDMDRVINS pDrvIns, PPPDMTHREAD ppThread, void *pvUser, PFNPDMTHREADDRV pfnThread,
                                                      PFNPDMTHREADWAKEUPDRV pfnWakeup, size_t cbStack, RTTHREADTYPE enmType, const char *pszName);
+static DECLCALLBACK(VMSTATE) pdmR3DrvHlp_VMState(PPDMDRVINS pDrvIns);
+
 
 #ifdef VBOX_WITH_PDM_ASYNC_COMPLETION
@@ -103 +105 @@
  */
 #ifdef VBOX_STRICT
-# define PDMDRV_ASSERT_DRVINS(pDrvIns)   do { Assert(pDrvIns); Assert(pDrvIns->u32Version == PDM_DRVINS_VERSION); Assert(pDrvIns->pvInstanceData == (void *)&pDrvIns->achInstanceData[0]); } while (0)
+# define PDMDRV_ASSERT_DRVINS(pDrvIns) \
+    do { \
+        AssertPtr(pDrvIns); \
+        Assert(pDrvIns->u32Version == PDM_DRVINS_VERSION); \
+        Assert(pDrvIns->pvInstanceData == (void *)&pDrvIns->achInstanceData[0]); \
+    } while (0)
 #else
 # define PDMDRV_ASSERT_DRVINS(pDrvIns)   do { } while (0)
@@ -145 +152 @@
     pdmR3DrvHlp_USBRegisterHub,
     pdmR3DrvHlp_PDMThreadCreate,
+    pdmR3DrvHlp_VMState,
 #ifdef VBOX_WITH_PDM_ASYNC_COMPLETION
     pdmR3DrvHlp_PDMAsyncCompletionTemplateCreate,
@@ -1074 +1082 @@
 }
 
+
+/** @copydoc PDMDEVHLP::pfnVMState */
+static DECLCALLBACK(VMSTATE) pdmR3DrvHlp_VMState(PPDMDRVINS pDrvIns)
+{
+    PDMDRV_ASSERT_DRVINS(pDrvIns);
+
+    VMSTATE enmVMState = VMR3GetState(pDrvIns->Internal.s.pVM);
+
+    LogFlow(("pdmR3DrvHlp_VMState: caller='%s'/%d: returns %d (%s)\n", pDrvIns->pDrvReg->szDriverName, pDrvIns->iInstance,
+             enmVMState, VMR3GetStateName(enmVMState)));
+    return enmVMState;
+}
+
+
 #ifdef VBOX_WITH_PDM_ASYNC_COMPLETION
+/** @copydoc PDMDRVHLP::pfnPDMAsyncCompletionTemplateCreate */
 static DECLCALLBACK(int) pdmR3DrvHlp_PDMAsyncCompletionTemplateCreate(PPDMDRVINS pDrvIns, PPPDMASYNCCOMPLETIONTEMPLATE ppTemplate,
                                                                       PFNPDMASYNCCOMPLETEDRV pfnCompleted, const char *pszDesc)