Changeset 75990 in vbox for trunk/src/VBox/Devices

Timestamp:

Dec 5, 2018 7:51:01 PM (6 years ago)

Author:

vboxsync

Message:

VMMDev,HGCM: Added cancellation notification and query helper.

Location:

trunk/src/VBox/Devices/VMMDev

Files:

• VMMDev.cpp (modified) (1 diff)
• VMMDevHGCM.cpp (modified) (3 diffs)
• VMMDevHGCM.h (modified) (1 diff)
• VMMDevState.h (modified) (1 diff)

trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

@@ -4427 +4427 @@
     pThis->IHGCMPort.pfnCompleted           = hgcmCompleted;
     pThis->IHGCMPort.pfnIsCmdRestored       = hgcmIsCmdRestored;
+    pThis->IHGCMPort.pfnIsCmdCancelled      = hgcmIsCmdCancelled;
     pThis->IHGCMPort.pfnGetRequestor        = hgcmGetRequestor;
     pThis->IHGCMPort.pfnGetVMMDevSessionId  = hgcmGetVMMDevSessionId;

trunk/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp

@@ -1169 +1169 @@
     {
         pCmd->fCancelled = true;
+
         Log(("vmmdevHGCMCancel2: Cancelled pCmd=%p / GCPhys=%#x\n", pCmd, GCPhys));
+        if (pThis->pHGCMDrv)
+            pThis->pHGCMDrv->pfnCancelled(pThis->pHGCMDrv, pCmd,
+                                          pCmd->enmCmdType == VBOXHGCMCMDTYPE_CALL ? pCmd->u.call.u32ClientID
+                                          : pCmd->enmCmdType == VBOXHGCMCMDTYPE_CONNECT ? pCmd->u.connect.u32ClientID
+                                          : pCmd->enmCmdType == VBOXHGCMCMDTYPE_DISCONNECT ? pCmd->u.disconnect.u32ClientID
+                                          : 0);
     }
     else
@@ -1537 +1544 @@
 
 /**
+ * @interface_method_impl{PDMIHGCMPORT,pfnIsCmdCancelled}
+ */
+DECLCALLBACK(bool) hgcmIsCmdCancelled(PPDMIHGCMPORT pInterface, PVBOXHGCMCMD pCmd)
+{
+    RT_NOREF(pInterface);
+    return pCmd && pCmd->fCancelled;
+}
+
+/**
  * @interface_method_impl{PDMIHGCMPORT,pfnGetRequestor}
  */
@@ -1589 +1605 @@
             LogFlowFunc(("Saving %RGp, size %d\n", pCmd->GCPhys, pCmd->cbRequest));
 
+            /** @todo Don't save cancelled requests! It serves no purpose.  See restore and
+             *        @bugref{4032#c4} for details. */
             SSMR3PutU32     (pSSM, (uint32_t)pCmd->enmCmdType);
             SSMR3PutBool    (pSSM, pCmd->fCancelled);

trunk/src/VBox/Devices/VMMDev/VMMDevHGCM.h

@@ -31 +31 @@
 DECLCALLBACK(int)  hgcmCompleted(PPDMIHGCMPORT pInterface, int32_t result, PVBOXHGCMCMD pCmdPtr);
 DECLCALLBACK(bool) hgcmIsCmdRestored(PPDMIHGCMPORT pInterface, PVBOXHGCMCMD pCmd);
+DECLCALLBACK(bool) hgcmIsCmdCancelled(PPDMIHGCMPORT pInterface, PVBOXHGCMCMD pCmd);
 DECLCALLBACK(uint32_t) hgcmGetRequestor(PPDMIHGCMPORT pInterface, PVBOXHGCMCMD pCmd);
 DECLCALLBACK(uint64_t) hgcmGetVMMDevSessionId(PPDMIHGCMPORT pInterface);

trunk/src/VBox/Devices/VMMDev/VMMDevState.h

@@ -156 +156 @@
     /** LUN\#0: HGCM port interface. */
     PDMIHGCMPORT IHGCMPort;
-# if HC_ARCH_BITS == 32
-    RTR3PTR      R3PtrAlignment1;
-# endif
+//# if HC_ARCH_BITS == 32
+//    RTR3PTR      R3PtrAlignment1;
+//# endif
 #endif
     /** Pointer to base interface of the driver. */