Changeset 906 in vbox

Timestamp:

Feb 14, 2007 2:27:46 PM (18 years ago)

Author:

vboxsync

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

18628

Message:

Save and load state notifications for HGCM host services added.

Location:

trunk/src/VBox/Main

Files:

• VMMDevInterface.cpp (modified) (2 diffs)
• hgcm/HGCM.cpp (modified) (5 diffs)
• include/hgcm/HGCM.h (modified) (2 diffs)

trunk/src/VBox/Main/VMMDevInterface.cpp

@@ -317 +317 @@
 }
 
+/**
+ * Execute state save operation.
+ *
+ * @returns VBox status code.
+ * @param   pDrvIns         Driver instance of the driver which registered the data unit.
+ * @param   pSSM            SSM operation handle.
+ */
+static DECLCALLBACK(int) iface_hgcmSave(PPDMDRVINS pDrvIns, PSSMHANDLE pSSM)
+{
+    PDRVMAINVMMDEV pDrv = PDMINS2DATA(pDrvIns, PDRVMAINVMMDEV);
+    
+    return hgcmSaveStateInternal (pDrv->pHGCMPort, pDrv->pVMMDev->mSharedFolderClientId, pSSM);
+}
+
+
+/**
+ * Execute state load operation.
+ *
+ * @returns VBox status code.
+ * @param   pDrvIns         Driver instance of the driver which registered the data unit.
+ * @param   pSSM            SSM operation handle.
+ * @param   u32Version      Data layout version.
+ */
+static DECLCALLBACK(int) iface_hgcmLoad(PPDMDRVINS pDrvIns, PSSMHANDLE pSSM, uint32_t u32Version)
+{
+    PDRVMAINVMMDEV pDrv = PDMINS2DATA(pDrvIns, PDRVMAINVMMDEV);
+
+    if (u32Version != HGCM_SSM_VERSION)
+        return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
+
+    return hgcmLoadStateInternal (pDrv->pHGCMPort, pDrv->pVMMDev->mSharedFolderClientId, pSSM);
+}
+
 int VMMDev::hgcmLoadService (const char *pszServiceName, const char *pszServiceLibrary)
 {
@@ -542 +575 @@
         pData->pVMMDev->mSharedFolderClientId = 0;
     }
+#if 0 /* enable later */
+    pDrvIns->pDrvHlp->pfnSSMRegister(pDrvIns, "HGCM", 0, HGCM_SSM_VERSION, 4096/* bad guess */, NULL, iface_hgcmSave, NULL, NULL, iface_hgcmLoad, NULL);
+#endif 
 #endif
 

trunk/src/VBox/Main/hgcm/HGCM.cpp

@@ -272 +272 @@
 #define HGCMMSGID_DISCONNECT (11)
 #define HGCMMSGID_LOAD       (12)
-
 #define HGCMMSGID_HOSTCALL   (13)
+#define HGCMMSGID_LOADSTATE  (14)
+#define HGCMMSGID_SAVESTATE  (15)
 
 class HGCMMsgConnect: public HGCMMsgHeader
@@ -291 +292 @@
         /* client identifier */
         uint32_t u32ClientID;
+};
+
+class HGCMMsgLoadSaveState: public HGCMMsgHeader
+{
+    public:
+        /* client identifier */
+        uint32_t    u32ClientID;
+        PSSMHANDLE  pSSM;
 };
 
@@ -388 +397 @@
         case HGCMMSGID_LOAD:            return new HGCMMsgLoad ();
         case HGCMMSGID_HOSTCALL:        return new HGCMMsgHostCall ();
+        case HGCMMSGID_LOADSTATE:      
+        case HGCMMSGID_SAVESTATE:       return new HGCMMsgLoadSaveState ();
         default:
             Log(("hgcmMessageAlloc::Unsupported message number %08X\n", u32MsgId));
@@ -520 +531 @@
                 rc = VINF_SUCCESS;
             } break;
+
+            case HGCMMSGID_LOADSTATE:
+            {
+                LogFlow(("HGCMMSGID_LOADSTATE\n"));
+
+                HGCMMsgLoadSaveState *pMsg = (HGCMMsgLoadSaveState *)pMsgCore;
+                HGCMClient *pClient = (HGCMClient *)hgcmObjReference (pMsg->u32ClientID);
+
+                rc = VINF_SUCCESS;
+                if (pClient && pSvc->m_fntable.pfnLoadState)
+                {
+                    rc = pSvc->m_fntable.pfnLoadState (pMsg->u32ClientID, HGCM_CLIENT_DATA(pSvc, pClient), pMsg->pSSM);
+                    hgcmObjDereference (pClient);
+                }
+                break;
+            }
+
+            case HGCMMSGID_SAVESTATE:
+            {
+                LogFlow(("HGCMMSGID_SAVESTATE\n"));
+
+                HGCMMsgLoadSaveState *pMsg = (HGCMMsgLoadSaveState *)pMsgCore;
+                HGCMClient *pClient = (HGCMClient *)hgcmObjReference (pMsg->u32ClientID);
+
+                rc = VINF_SUCCESS;
+                if (pClient && pSvc->m_fntable.pfnSaveState)
+                {
+                    rc = pSvc->m_fntable.pfnSaveState (pMsg->u32ClientID, HGCM_CLIENT_DATA(pSvc, pClient), pMsg->pSSM);
+                    hgcmObjDereference (pClient);
+                }
+                break;
+            }
 
             default:
@@ -1275 +1318 @@
 }
 
+int hgcmSaveStateInternal (PPDMIHGCMPORT pHGCMPort, uint32_t u32ClientID, PSSMHANDLE pSSM)
+{
+    int rc = VINF_SUCCESS;
+
+    LogFlow(("MAIN::hgcmSaveStateInternal: pHGCMPort = %p, u32ClientID = %d\n",
+             pHGCMPort, u32ClientID));
+
+    if (!pHGCMPort)
+    {
+        return VERR_INVALID_PARAMETER;
+    }
+
+    HGCMMSGHANDLE hMsg = 0;
+
+    rc = hgcmMsgAlloc (g_hgcmThread, &hMsg, HGCMMSGID_SAVESTATE, sizeof (HGCMMsgLoadSaveState), hgcmMessageAlloc);
+
+    if (VBOX_SUCCESS(rc))
+    {
+        HGCMMsgLoadSaveState *pMsg = (HGCMMsgLoadSaveState *)hgcmObjReference (hMsg);
+
+        AssertRelease(pMsg);
+
+        pMsg->pHGCMPort   = pHGCMPort;
+        pMsg->u32ClientID = u32ClientID;
+        pMsg->pSSM        = pSSM;
+
+        rc = hgcmMsgSend (hMsg);
+
+        hgcmObjDereference (pMsg);
+    }
+    else
+    {
+        Log(("MAIN::hgcmSaveStateInternal: Message allocation failed: %Vrc\n", rc));
+    }
+
+    return rc;
+}
+
+int hgcmLoadStateInternal (PPDMIHGCMPORT pHGCMPort, uint32_t u32ClientID, PSSMHANDLE pSSM)
+{
+    int rc = VINF_SUCCESS;
+
+    LogFlow(("MAIN::hgcmLoadStateInternal: pHGCMPort = %p, u32ClientID = %d\n",
+             pHGCMPort, u32ClientID));
+
+    if (!pHGCMPort)
+    {
+        return VERR_INVALID_PARAMETER;
+    }
+
+    HGCMMSGHANDLE hMsg = 0;
+
+    rc = hgcmMsgAlloc (g_hgcmThread, &hMsg, HGCMMSGID_LOADSTATE, sizeof (HGCMMsgLoadSaveState), hgcmMessageAlloc);
+
+    if (VBOX_SUCCESS(rc))
+    {
+        HGCMMsgLoadSaveState *pMsg = (HGCMMsgLoadSaveState *)hgcmObjReference (hMsg);
+
+        AssertRelease(pMsg);
+
+        pMsg->pHGCMPort   = pHGCMPort;
+        pMsg->u32ClientID = u32ClientID;
+        pMsg->pSSM        = pSSM;
+
+        rc = hgcmMsgSend (hMsg);
+
+        hgcmObjDereference (pMsg);
+    }
+    else
+    {
+        Log(("MAIN::hgcmLoadStateInternal: Message allocation failed: %Vrc\n", rc));
+    }
+
+    return rc;
+}
+
 int hgcmLoadInternal (const char *pszServiceName, const char *pszServiceLibrary)
 {

trunk/src/VBox/Main/include/hgcm/HGCM.h

@@ -30 +30 @@
 #include <VBox/hgcmsvc.h>
 
+/* HGCM saved state version */
+#define HGCM_SSM_VERSION    1
+
 __BEGIN_DECLS
 int hgcmInit (void);
@@ -39 +42 @@
 int hgcmGuestCallInternal (PPDMIHGCMPORT pHGCMPort, PVBOXHGCMCMD pCmdPtr, uint32_t clientID, uint32_t function, uint32_t cParms, VBOXHGCMSVCPARM aParms[], bool fBlock);
 int hgcmHostCallInternal (const char *pszServiceName, uint32_t function, uint32_t cParms, VBOXHGCMSVCPARM aParms[]);
+
+int hgcmSaveStateInternal (PPDMIHGCMPORT pHGCMPort, uint32_t clientID, PSSMHANDLE pSSM);
+int hgcmLoadStateInternal (PPDMIHGCMPORT pHGCMPort, uint32_t clientID, PSSMHANDLE pSSM);
+
 __END_DECLS