Changeset 83504 in vbox for trunk/src/VBox/HostServices/GuestControl

Timestamp:

Apr 1, 2020 3:28:53 PM (5 years ago)

Author:

vboxsync

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

136798

Message:

Guest Control/HostService: Logging for querying/setting features.

File:

• trunk/src/VBox/HostServices/GuestControl/VBoxGuestControlSvc.cpp (modified) (5 diffs)

trunk/src/VBox/HostServices/GuestControl/VBoxGuestControlSvc.cpp

@@ -911 +911 @@
     int clientMakeMeMaster(ClientState *pClient, VBOXHGCMCALLHANDLE hCall, uint32_t cParms);
     int clientReportFeatures(ClientState *pClient, VBOXHGCMCALLHANDLE hCall, uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
-    int clientQueryFeatures(VBOXHGCMCALLHANDLE hCall, uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
+    int clientQueryFeatures(ClientState *pClient, VBOXHGCMCALLHANDLE hCall, uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
     int clientMsgPeek(ClientState *pClient, VBOXHGCMCALLHANDLE hCall, uint32_t cParms, VBOXHGCMSVCPARM paParms[], bool fWait);
     int clientMsgGet(ClientState *pClient, VBOXHGCMCALLHANDLE hCall, uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
@@ -1198 +1198 @@
         m_fGuestFeatures0 = fFeatures0;
         m_fGuestFeatures1 = fFeatures1;
-        Log(("[Client %RU32] features: %#RX64 %#RX64\n", pClient->m_idClient, fFeatures0, fFeatures1));
+        Log(("[Client %RU32] reported features: %#RX64 %#RX64\n", pClient->m_idClient, fFeatures0, fFeatures1));
 
         /*
@@ -1219 +1219 @@
  * @retval  VERR_WRONG_PARAMETER_COUNT
  *
+ * @param   pClient     The client state.
  * @param   hCall       The client's call handle.
  * @param   cParms      Number of parameters.
  * @param   paParms     Array of parameters.
  */
-int GstCtrlService::clientQueryFeatures(VBOXHGCMCALLHANDLE hCall, uint32_t cParms, VBOXHGCMSVCPARM paParms[])
+int GstCtrlService::clientQueryFeatures(ClientState *pClient,
+                                        VBOXHGCMCALLHANDLE hCall, uint32_t cParms, VBOXHGCMSVCPARM paParms[])
 {
     /*
@@ -1239 +1241 @@
     paParms[1].u.uint64 = 0;
     int rc = mpHelpers->pfnCallComplete(hCall, VINF_SUCCESS);
-    if (RT_FAILURE(rc))
+    if (RT_SUCCESS(rc))
+    {
+        Log(("[Client %RU32] query features: %#RX64 0\n", pClient->m_idClient, g_fGstCtrlHostFeatures0));
+    }
+    else
         LogFunc(("pfnCallComplete -> %Rrc\n", rc));
 
@@ -2113 +2119 @@
         case GUEST_MSG_QUERY_FEATURES:
             LogFlowFunc(("[Client %RU32] GUEST_MSG_QUERY_FEATURES\n", idClient));
-            rc = pThis->clientQueryFeatures(hCall, cParms, paParms);
+            rc = pThis->clientQueryFeatures(pClient, hCall, cParms, paParms);
             break;
         case GUEST_MSG_PEEK_NOWAIT: