Changeset 60548 in vbox for trunk

Timestamp:

Apr 18, 2016 5:33:15 PM (9 years ago)

Author:

vboxsync

Message:

ValdiationKit/usb: Return bus and device ID for the created gadget to make it usable for device filters

Location:

trunk/src/VBox/ValidationKit

Files:

• tests/usb/usbgadget2.py (modified) (4 diffs)
• utils/usb/UsbTestService.cpp (modified) (1 diff)
• utils/usb/UsbTestServiceProtocol.h (modified) (1 diff)

trunk/src/VBox/ValidationKit/tests/usb/usbgadget2.py

@@ -1295 +1295 @@
         self.sImpersonation = g_ksGadgetImpersonationInvalid;
         self.idGadget       = None;
+        self.iBusId         = None;
+        self.iDevId         = None;
         self.iUsbIpPort     = None;
 
@@ -1306 +1308 @@
             fRc = self.oUtsSession.syncGadgetDestroy(self.idGadget);
             self.idGadget = None;
+            self.iBusId   = None;
+            self.iDevId   = None;
 
         return fRc;
@@ -1340 +1344 @@
                 fRc = True;
                 self.idGadget = getU32(abPayload, 16);
+                self.iBusId   = getU32(abPayload, 20);
+                self.iDevId   = getU32(abPayload, 24);
         else:
             reporter.log('Invalid or unsupported impersonation');
@@ -1351 +1357 @@
         """
         return self.iUsbIpPort;
+
+    def getGadgetBusAndDevId(self):
+        """
+        Returns the bus ad device ID of the gadget as a tuple.
+        """
+        return (self.iBusId, self.iDevId);
 
     def connectTo(self, cMsTimeout, sHostname, uPort = None, fUsbIpSupport = True, cMsIdleFudge = 0):

trunk/src/VBox/ValidationKit/utils/usb/UsbTestService.cpp

@@ -703 +703 @@
 
         Rep.idGadget = 0;
+        Rep.u32BusId = utsGadgetGetBusId(pClient->hGadget);
+        Rep.u32DevId = utsGadgetGetDevId(pClient->hGadget);
         rc = utsReplyInternal(pClient, &Rep.Sts, "ACK     ", sizeof(Rep) - sizeof(UTSPKTSTS));
     }

trunk/src/VBox/ValidationKit/utils/usb/UsbTestServiceProtocol.h

@@ -221 +221 @@
     /** The gadget ID on success. */
     uint32_t        idGadget;
-    /** Padding - reserved. */
-    uint8_t         au8Padding[12];
+    /** Bus ID the gadget is attached to */
+    uint32_t        u32BusId;
+    /** Device ID of the gadget on the bus. */
+    uint32_t        u32DevId;
+    /** Padding - reserved. */
+    uint8_t         au8Padding[4];
 } UTSPKTREPGDGTCTOR;
 AssertCompileSizeAlignment(UTSPKTREPGDGTCTOR, UTSPKT_ALIGNMENT);