Changeset 75853 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Nov 30, 2018 7:26:42 PM (6 years ago)

Author:

vboxsync

Message:

GuestControl,HGCM,VBoxService: Save/restore related optimizations and changes. bugref:9313

Location:

trunk/src/VBox/Main/src-client

Files:

• ConsoleImpl2.cpp (modified) (3 diffs)
• HGCM.cpp (modified) (36 diffs)
• VMMDevInterface.cpp (modified) (4 diffs)

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -36 +36 @@
 #include "ConsoleImpl.h"
 #include "DisplayImpl.h"
-#ifdef VBOX_WITH_GUEST_CONTROL
+#ifdef VBOX_WITH_DRAG_AND_DROP
 # include "GuestImpl.h"
-#endif
-#ifdef VBOX_WITH_DRAG_AND_DROP
 # include "GuestDnDPrivate.h"
 #endif
@@ -3194 +3192 @@
          */
         rc = i_configGuestProperties(this);
-#endif
-
-#ifdef VBOX_WITH_GUEST_CONTROL
-        /*
-         * Guest control service.
-         */
-        rc = i_configGuestControl(this);
 #endif
 
@@ -6235 +6226 @@
 }
 
-/**
- * Set up the Guest Control service.
- */
-/* static */ int Console::i_configGuestControl(void *pvConsole)
-{
-#ifdef VBOX_WITH_GUEST_CONTROL
-    AssertReturn(pvConsole, VERR_INVALID_POINTER);
-    ComObjPtr<Console> pConsole = static_cast<Console *>(pvConsole);
-
-    /* Load the service */
-    int rc = pConsole->m_pVMMDev->hgcmLoadService("VBoxGuestControlSvc", "VBoxGuestControlSvc");
-
-    if (RT_FAILURE(rc))
-    {
-        LogRel(("VBoxGuestControlSvc is not available. rc = %Rrc\n", rc));
-        /* That is not a fatal failure. */
-        rc = VINF_SUCCESS;
-    }
-    else
-    {
-        HGCMSVCEXTHANDLE hDummy;
-        rc = HGCMHostRegisterServiceExtension(&hDummy, "VBoxGuestControlSvc",
-                                              &Guest::i_notifyCtrlDispatcher,
-                                              pConsole->i_getGuest());
-        if (RT_FAILURE(rc))
-            Log(("Cannot register VBoxGuestControlSvc extension!\n"));
-        else
-            LogRel(("Guest Control service loaded\n"));
-    }
-
-    return rc;
-#else /* !VBOX_WITH_GUEST_CONTROL */
-    return VERR_NOT_SUPPORTED;
-#endif /* !VBOX_WITH_GUEST_CONTROL */
-}

trunk/src/VBox/Main/src-client/HGCM.cpp

@@ -118 +118 @@
 
         PUVM m_pUVM;
+        PPDMIHGCMPORT m_pHgcmPort;
 
         /** @name Statistics
@@ -130 +131 @@
          * Main HGCM thread methods.
          */
-        int instanceCreate(const char *pszServiceLibrary, const char *pszServiceName, PUVM pUVM);
+        int instanceCreate(const char *pszServiceLibrary, const char *pszServiceName, PUVM pUVM, PPDMIHGCMPORT pHgcmPort);
         void instanceDestroy(void);
 
         int saveClientState(uint32_t u32ClientId, PSSMHANDLE pSSM);
-        int loadClientState(uint32_t u32ClientId, PSSMHANDLE pSSM);
+        int loadClientState(uint32_t u32ClientId, PSSMHANDLE pSSM, uint32_t uVersion);
 
         HGCMService();
@@ -150 +151 @@
         static DECLCALLBACK(int)  svcHlpInfoDeregister(void *pvInstance, const char *pszName);
         static DECLCALLBACK(uint32_t) svcHlpGetRequestor(VBOXHGCMCALLHANDLE hCall);
+        static DECLCALLBACK(uint64_t) svcHlpGetVMMDevSessionId(void *pvInstance);
 
     public:
@@ -156 +158 @@
          * Main HGCM thread methods.
          */
-        static int LoadService(const char *pszServiceLibrary, const char *pszServiceName, PUVM pUVM);
+        static int LoadService(const char *pszServiceLibrary, const char *pszServiceName, PUVM pUVM, PPDMIHGCMPORT pHgcmPort);
         void UnloadService(bool fUvmIsInvalid);
 
@@ -168 +170 @@
 
         static int SaveState(PSSMHANDLE pSSM);
-        static int LoadState(PSSMHANDLE pSSM);
+        static int LoadState(PSSMHANDLE pSSM, uint32_t uVersion);
 
         int CreateAndConnectClient(uint32_t *pu32ClientIdOut, uint32_t u32ClientIdIn, uint32_t fRequestor, bool fRestoring);
@@ -199 +201 @@
 {
     public:
-        HGCMClient() : HGCMObject(HGCMOBJ_CLIENT), pService(NULL),
-                        pvData(NULL) {};
+        HGCMClient(uint32_t a_fRequestor)
+            : HGCMObject(HGCMOBJ_CLIENT)
+            , pService(NULL)
+            , pvData(NULL)
+            , fRequestor(a_fRequestor)
+        {}
         ~HGCMClient();
 
@@ -210 +216 @@
         /** Client specific data. */
         void *pvData;
+
+        /** The requestor flags this client was created with.
+         * @sa VMMDevRequestHeader::fRequestor */
+        uint32_t fRequestor;
+
+    private: /* none of this: */
+        HGCMClient();
+        HGCMClient(HGCMClient const &);
+        HGCMClient &operator=(HGCMClient const &);
 };
 
@@ -215 +230 @@
 {
     if (pService->SizeOfClient() > 0)
+    {
         RTMemFree(pvData);
-}
+        pvData = NULL;
+    }
+}
+
 
 int HGCMClient::Init(HGCMService *pSvc)
@@ -261 +280 @@
 #endif
     m_hExtension (NULL),
-    m_pUVM       (NULL)
+    m_pUVM       (NULL),
+    m_pHgcmPort  (NULL)
 {
     RT_ZERO(m_fntable);
@@ -469 +489 @@
 {
     public:
+        PSSMHANDLE  pSSM;
+        uint32_t    uVersion;
         uint32_t    u32ClientId;
-        PSSMHANDLE  pSSM;
 };
 
@@ -684 +705 @@
                 if (pClient)
                 {
-                    if (pSvc->m_fntable.pfnLoadState)
+                    /* fRequestor: Restored by the message sender already. */
+                    bool fHaveClientState = pSvc->m_fntable.pfnLoadState != NULL;
+                    if (pMsg->uVersion > HGCM_SAVED_STATE_VERSION_V2)
+                        rc = SSMR3GetBool(pMsg->pSSM, &fHaveClientState);
+                    else
+                        rc = VINF_SUCCESS;
+                    if (RT_SUCCESS(rc) )
                     {
-                        rc = pSvc->m_fntable.pfnLoadState(pSvc->m_fntable.pvService, pMsg->u32ClientId,
-                                                          HGCM_CLIENT_DATA(pSvc, pClient), pMsg->pSSM);
+                        if (pSvc->m_fntable.pfnLoadState)
+                            rc = pSvc->m_fntable.pfnLoadState(pSvc->m_fntable.pvService, pMsg->u32ClientId,
+                                                              HGCM_CLIENT_DATA(pSvc, pClient), pMsg->pSSM,
+                                                              fHaveClientState ? pMsg->uVersion : 0);
+                        else
+                            AssertLogRelStmt(!fHaveClientState, rc = VERR_INTERNAL_ERROR_5);
                     }
-
                     hgcmObjDereference(pClient);
                 }
@@ -710 +740 @@
                 if (pClient)
                 {
-                    if (pSvc->m_fntable.pfnSaveState)
+                    SSMR3PutU32(pMsg->pSSM, pClient->fRequestor); /* Quicker to save this here than in the message sender. */
+                    rc = SSMR3PutBool(pMsg->pSSM, pSvc->m_fntable.pfnSaveState != NULL);
+                    if (RT_SUCCESS(rc) && pSvc->m_fntable.pfnSaveState)
                     {
                         g_fSaveState = true;
@@ -893 +925 @@
 }
 
-
 /**
  * @interface_method_impl{VBOXHGCMSVCHELPERS,pfnGetRequestor}
@@ -909 +940 @@
 
     return pHgcmPort->pfnGetRequestor(pHgcmPort, pCmd);
+}
+
+/**
+ * @interface_method_impl{VBOXHGCMSVCHELPERS,pfnGetVMMDevSessionId}
+ */
+/* static */ DECLCALLBACK(uint64_t) HGCMService::svcHlpGetVMMDevSessionId(void *pvInstance)
+{
+     HGCMService *pService = static_cast <HGCMService *>(pvInstance);
+     AssertPtrReturn(pService, UINT64_MAX);
+
+     PPDMIHGCMPORT pHgcmPort = pService->m_pHgcmPort;
+     AssertPtrReturn(pHgcmPort, UINT64_MAX);
+
+     return pHgcmPort->pfnGetVMMDevSessionId(pHgcmPort);
 }
 
@@ -933 +978 @@
  */
 
-int HGCMService::instanceCreate(const char *pszServiceLibrary, const char *pszServiceName, PUVM pUVM)
+int HGCMService::instanceCreate(const char *pszServiceLibrary, const char *pszServiceName, PUVM pUVM, PPDMIHGCMPORT pHgcmPort)
 {
     LogFlowFunc(("name %s, lib %s\n", pszServiceName, pszServiceLibrary));
@@ -964 +1009 @@
         else
         {
+            m_pUVM = pUVM;
+            m_pHgcmPort = pHgcmPort;
+
             /* Register statistics: */
-            m_pUVM = pUVM;
             STAMR3RegisterFU(pUVM, &m_StatHandleMsg, STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_OCCURENCES,
                              "Message handling", "/HGCM/%s/Msg", pszServiceName);
 
             /* Initialize service helpers table. */
-            m_svcHelpers.pfnCallComplete     = svcHlpCallComplete;
-            m_svcHelpers.pvInstance          = this;
-            m_svcHelpers.pfnDisconnectClient = svcHlpDisconnectClient;
-            m_svcHelpers.pfnIsCallRestored   = svcHlpIsCallRestored;
-            m_svcHelpers.pfnStamRegisterV    = svcHlpStamRegisterV;
-            m_svcHelpers.pfnStamDeregisterV  = svcHlpStamDeregisterV;
-            m_svcHelpers.pfnInfoRegister     = svcHlpInfoRegister;
-            m_svcHelpers.pfnInfoDeregister   = svcHlpInfoDeregister;
-            m_svcHelpers.pfnGetRequestor     = svcHlpGetRequestor;
+            m_svcHelpers.pfnCallComplete       = svcHlpCallComplete;
+            m_svcHelpers.pvInstance            = this;
+            m_svcHelpers.pfnDisconnectClient   = svcHlpDisconnectClient;
+            m_svcHelpers.pfnIsCallRestored     = svcHlpIsCallRestored;
+            m_svcHelpers.pfnStamRegisterV      = svcHlpStamRegisterV;
+            m_svcHelpers.pfnStamDeregisterV    = svcHlpStamDeregisterV;
+            m_svcHelpers.pfnInfoRegister       = svcHlpInfoRegister;
+            m_svcHelpers.pfnInfoDeregister     = svcHlpInfoDeregister;
+            m_svcHelpers.pfnGetRequestor       = svcHlpGetRequestor;
+            m_svcHelpers.pfnGetVMMDevSessionId = svcHlpGetVMMDevSessionId;
 
             /* Execute the load request on the service thread. */
@@ -1022 +1070 @@
         STAMR3DeregisterF(m_pUVM, "/HGCM/%s/*", m_pszSvcName);
     m_pUVM = NULL;
+    m_pHgcmPort = NULL;
 
     RTStrFree(m_pszSvcLibrary);
@@ -1051 +1100 @@
 }
 
-int HGCMService::loadClientState(uint32_t u32ClientId, PSSMHANDLE pSSM)
+int HGCMService::loadClientState(uint32_t u32ClientId, PSSMHANDLE pSSM, uint32_t uVersion)
 {
     LogFlowFunc(("%s\n", m_pszSvcName));
@@ -1062 +1111 @@
         HGCMMsgLoadSaveStateClient *pMsg = (HGCMMsgLoadSaveStateClient *)pCoreMsg;
 
+        pMsg->pSSM        = pSSM;
+        pMsg->uVersion    = uVersion;
         pMsg->u32ClientId = u32ClientId;
-        pMsg->pSSM        = pSSM;
 
         rc = hgcmMsgSend(pMsg);
@@ -1075 +1125 @@
 /** The method creates a service and references it.
  *
- * @param pszServiceLibrary  The library to be loaded.
- * @param pszServiceName     The name of the service.
- * @param pUVM               The user mode VM handle (for statistics and such).
- * @return VBox rc.
- * @thread main HGCM
- */
-/* static */ int HGCMService::LoadService(const char *pszServiceLibrary, const char *pszServiceName, PUVM pUVM)
+ * @param   pszServiceLibrary  The library to be loaded.
+ * @param   pszServiceName     The name of the service.
+ * @param   pUVM               The user mode VM handle (for statistics and such).
+ * @param   pHgcmPort          The VMMDev HGCM port interface.
+ *
+ * @return  VBox rc.
+ * @thread  main HGCM
+ */
+/* static */ int HGCMService::LoadService(const char *pszServiceLibrary, const char *pszServiceName,
+                                          PUVM pUVM, PPDMIHGCMPORT pHgcmPort)
 {
     LogFlowFunc(("lib %s, name = %s, pUVM = %p\n", pszServiceLibrary, pszServiceName, pUVM));
@@ -1108 +1161 @@
         {
             /* Load the library and call the initialization entry point. */
-            rc = pSvc->instanceCreate(pszServiceLibrary, pszServiceName, pUVM);
+            rc = pSvc->instanceCreate(pszServiceLibrary, pszServiceName, pUVM, pHgcmPort);
 
             if (RT_SUCCESS(rc))
@@ -1151 +1204 @@
 
     if (fUvmIsInvalid)
+    {
         m_pUVM = NULL;
+        m_pHgcmPort = NULL;
+    }
 
     /* Remove the service from the list. */
@@ -1354 +1410 @@
             Log(("client id 0x%08X\n", u32ClientId));
 
-            /* Save the client id. */
+            /* Save the client id. (fRequestor is saved via SVC_MSG_SAVESTATE for convenience.) */
             rc = SSMR3PutU32(pSSM, u32ClientId);
             AssertRCReturn(rc, rc);
@@ -1371 +1427 @@
 /** The method loads saved HGCM state.
  *
- * @param pSSM  The saved state context.
+ * @param pSSM      The saved state handle.
+ * @param uVersion  The state version being loaded.
  * @return VBox rc.
  * @thread main HGCM
  */
-/* static */ int HGCMService::LoadState(PSSMHANDLE pSSM)
+/* static */ int HGCMService::LoadState(PSSMHANDLE pSSM, uint32_t uVersion)
 {
     /* Restore handle count to avoid client id conflicts. */
@@ -1424 +1481 @@
         while (cClients--)
         {
-            /* Get the client id. */
+            /* Get the client ID and fRequest (convieniently save via SVC_MSG_SAVESTATE
+               but restored here in time for calling CreateAndConnectClient). */
             uint32_t u32ClientId;
             rc = SSMR3GetU32(pSSM, &u32ClientId);
-            uint32_t fRequestor = VMMDEV_REQUESTOR_LEGACY; /** @todo save/restore fRequestor. */
-            if (RT_FAILURE(rc))
-            {
-                pSvc->ReleaseService();
-                AssertFailed();
-                return rc;
-            }
+            uint32_t fRequestor = VMMDEV_REQUESTOR_LEGACY;
+            if (RT_SUCCESS(rc) && uVersion > HGCM_SAVED_STATE_VERSION_V2)
+                rc = SSMR3GetU32(pSSM, &fRequestor);
+            AssertLogRelMsgRCReturnStmt(rc, ("rc=%Rrc, %s\n", rc, szServiceName), pSvc->ReleaseService(), rc);
 
             /* Connect the client. */
             rc = pSvc->CreateAndConnectClient(NULL, u32ClientId, fRequestor, true /*fRestoring*/);
-            if (RT_FAILURE(rc))
-            {
-                pSvc->ReleaseService();
-                AssertLogRelMsgFailed(("rc=%Rrc %s\n", rc, szServiceName));
-                return rc;
-            }
+            AssertLogRelMsgRCReturnStmt(rc, ("rc=%Rrc, %s\n", rc, szServiceName), pSvc->ReleaseService(), rc);
 
             /* Call the service, so the operation is executed by the service thread. */
-            rc = pSvc->loadClientState(u32ClientId, pSSM);
-            if (RT_FAILURE(rc))
-            {
-                pSvc->ReleaseService();
-                AssertLogRelMsgFailed(("rc=%Rrc %s\n", rc, szServiceName));
-                return rc;
-            }
+            rc = pSvc->loadClientState(u32ClientId, pSSM, uVersion);
+            AssertLogRelMsgRCReturnStmt(rc, ("rc=%Rrc, %s\n", rc, szServiceName), pSvc->ReleaseService(), rc);
         }
 
@@ -1475 +1520 @@
 
     /* Allocate a client information structure. */
-    HGCMClient *pClient = new HGCMClient();
+    HGCMClient *pClient = new (std::nothrow) HGCMClient(fRequestor);
 
     if (!pClient)
@@ -1851 +1896 @@
         /** The user mode VM handle (for statistics and such). */
         PUVM pUVM;
+        /** The HGCM port on the VMMDev device (for session ID and such). */
+        PPDMIHGCMPORT pHgcmPort;
 };
 
@@ -1869 +1916 @@
 {
     public:
-        /* SSM context. */
+        /** Saved state handle. */
         PSSMHANDLE pSSM;
+        /** The HGCM saved state version being loaded (ignore for save). */
+        uint32_t uVersion;
 };
 
@@ -2031 +2080 @@
                              pMsg->pszServiceName, pMsg->pszServiceLibrary, pMsg->pUVM));
 
-                rc = HGCMService::LoadService(pMsg->pszServiceLibrary, pMsg->pszServiceName, pMsg->pUVM);
+                rc = HGCMService::LoadService(pMsg->pszServiceLibrary, pMsg->pszServiceName, pMsg->pUVM, pMsg->pHgcmPort);
             } break;
 
@@ -2106 +2155 @@
                 LogFlowFunc(("HGCM_MSG_LOADSTATE\n"));
 
-                rc = HGCMService::LoadState(pMsg->pSSM);
+                rc = HGCMService::LoadState(pMsg->pSSM, pMsg->uVersion);
             } break;
 
@@ -2223 +2272 @@
  * @param pszServiceName     The name to be assigned to the service.
  * @param pUVM               The user mode VM handle (for statistics and such).
+ * @param pHgcmPort          The HGCM port on the VMMDev device (for session ID and such).
  * @return VBox rc.
  */
 int HGCMHostLoad(const char *pszServiceLibrary,
                  const char *pszServiceName,
-                 PUVM pUVM)
+                 PUVM pUVM,
+                 PPDMIHGCMPORT pHgcmPort)
 {
     LogFlowFunc(("lib = %s, name = %s\n", pszServiceLibrary, pszServiceName));
@@ -2248 +2299 @@
         pMsg->pszServiceName    = pszServiceName;
         pMsg->pUVM              = pUVM;
+        pMsg->pHgcmPort         = pHgcmPort;
 
         rc = hgcmMsgSend(pMsg);
@@ -2403 +2455 @@
 }
 
-/* Helper to send either HGCM_MSG_SAVESTATE or HGCM_MSG_LOADSTATE messages to the main HGCM thread.
+/** Helper to send either HGCM_MSG_SAVESTATE or HGCM_MSG_LOADSTATE messages to the main HGCM thread.
  *
  * @param pSSM     The SSM handle.
- * @param u32MsgId The message to be sent: HGCM_MSG_SAVESTATE or HGCM_MSG_LOADSTATE.
+ * @param idMsg    The message to be sent: HGCM_MSG_SAVESTATE or HGCM_MSG_LOADSTATE.
+ * @param uVersion The state version being loaded.
  * @return VBox rc.
  */
-static int hgcmHostLoadSaveState(PSSMHANDLE pSSM,
-                                 uint32_t u32MsgId)
-{
-    LogFlowFunc(("pSSM = %p, u32MsgId = %d\n", pSSM, u32MsgId));
+static int hgcmHostLoadSaveState(PSSMHANDLE pSSM, uint32_t idMsg, uint32_t uVersion)
+{
+    LogFlowFunc(("pSSM = %p, idMsg = %d, uVersion = uVersion\n", pSSM, idMsg));
 
     HGCMMsgCore *pCoreMsg;
-    int rc = hgcmMsgAlloc(g_pHgcmThread, &pCoreMsg, u32MsgId, hgcmMainMessageAlloc);
+    int rc = hgcmMsgAlloc(g_pHgcmThread, &pCoreMsg, idMsg, hgcmMainMessageAlloc);
 
     if (RT_SUCCESS(rc))
@@ -2423 +2475 @@
 
         pMsg->pSSM = pSSM;
+        pMsg->uVersion = uVersion;
 
         rc = hgcmMsgSend(pMsg);
@@ -2431 +2484 @@
 }
 
-/* Save the state of services.
+/** Save the state of services.
  *
  * @param pSSM     The SSM handle.
@@ -2438 +2491 @@
 int HGCMHostSaveState(PSSMHANDLE pSSM)
 {
-    return hgcmHostLoadSaveState(pSSM, HGCM_MSG_SAVESTATE);
-}
-
-/* Load the state of services.
+    return hgcmHostLoadSaveState(pSSM, HGCM_MSG_SAVESTATE, HGCM_SAVED_STATE_VERSION);
+}
+
+/** Load the state of services.
  *
  * @param pSSM     The SSM handle.
+ * @param uVersion The state version being loaded.
  * @return VBox rc.
  */
-int HGCMHostLoadState(PSSMHANDLE pSSM)
-{
-    return hgcmHostLoadSaveState(pSSM, HGCM_MSG_LOADSTATE);
+int HGCMHostLoadState(PSSMHANDLE pSSM, uint32_t uVersion)
+{
+    return hgcmHostLoadSaveState(pSSM, HGCM_MSG_LOADSTATE, uVersion);
 }
 

trunk/src/VBox/Main/src-client/VMMDevInterface.cpp

@@ -680 +680 @@
     LogFlowFunc(("Enter\n"));
 
-    if (uVersion != HGCM_SSM_VERSION)
+    if (   uVersion != HGCM_SAVED_STATE_VERSION
+        && uVersion != HGCM_SAVED_STATE_VERSION_V2)
         return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
     Assert(uPass == SSM_PASS_FINAL); NOREF(uPass);
 
-    return HGCMHostLoadState(pSSM);
+    return HGCMHostLoadState(pSSM, uVersion);
 }
 
@@ -692 +693 @@
         return VERR_INVALID_STATE;
 
+    /** @todo Construct all the services in the VMMDev::drvConstruct()!! */
+    Assert(   (mpDrv && mpDrv->pHGCMPort)
+           || !strcmp(pszServiceLibrary, "VBoxHostChannel")
+           || !strcmp(pszServiceLibrary, "VBoxSharedClipboard")
+           || !strcmp(pszServiceLibrary, "VBoxDragAndDropSvc")
+           || !strcmp(pszServiceLibrary, "VBoxGuestPropSvc")
+           || !strcmp(pszServiceLibrary, "VBoxSharedCrOpenGL")
+           );
     Console::SafeVMPtrQuiet ptrVM(mParent);
-    return HGCMHostLoad(pszServiceLibrary, pszServiceName, ptrVM.rawUVM());
+    return HGCMHostLoad(pszServiceLibrary, pszServiceName, ptrVM.rawUVM(), mpDrv ? mpDrv->pHGCMPort : NULL);
 }
 
@@ -864 +873 @@
 
 #ifdef VBOX_WITH_HGCM
-    rc = pThis->pVMMDev->hgcmLoadService(VBOXSHAREDFOLDERS_DLL,
-                                         "VBoxSharedFolders");
+    /*
+     * Load & configure the shared folders service.
+     */
+    rc = pThis->pVMMDev->hgcmLoadService(VBOXSHAREDFOLDERS_DLL, "VBoxSharedFolders");
     pThis->pVMMDev->fSharedFolderActive = RT_SUCCESS(rc);
     if (RT_SUCCESS(rc))
@@ -892 +903 @@
         LogRel(("Failed to load Shared Folders service %Rrc\n", rc));
 
-    rc = PDMDrvHlpSSMRegisterEx(pDrvIns, HGCM_SSM_VERSION, 4096 /* bad guess */,
+
+    /*
+     * Load and configure guest control service.
+     */
+# ifdef VBOX_WITH_GUEST_CONTROL
+    rc = pThis->pVMMDev->hgcmLoadService("VBoxGuestControlSvc", "VBoxGuestControlSvc");
+    if (RT_SUCCESS(rc))
+    {
+        HGCMSVCEXTHANDLE hDummy;
+        rc = HGCMHostRegisterServiceExtension(&hDummy, "VBoxGuestControlSvc",
+                                              &Guest::i_notifyCtrlDispatcher,
+                                              pThis->pVMMDev->mParent->i_getGuest());
+        if (RT_SUCCESS(rc))
+            LogRel(("Guest Control service loaded\n"));
+        else
+            LogRel(("Warning: Cannot register VBoxGuestControlSvc extension! rc=%Rrc\n", rc));
+    }
+    else
+        LogRel(("Warning!: Failed to load the Guest Control Service! %Rrc\n", rc));
+# endif /* VBOX_WITH_GUEST_CONTROL */
+
+
+    /*
+     * The HGCM saved state.
+     */
+    rc = PDMDrvHlpSSMRegisterEx(pDrvIns, HGCM_SAVED_STATE_VERSION, 4096 /* bad guess */,
                                 NULL, NULL, NULL,
                                 NULL, iface_hgcmSave, NULL,