Changeset 60089 in vbox for trunk/src/VBox/Main/include

Timestamp:

Mar 18, 2016 10:51:02 AM (9 years ago)

Author:

vboxsync

Message:

Main,VBoxManage: Add API to IHost for adding and removing USB device sources in addition to the default host one (only USB/IP backend supported so far which will be used in the future for automatic USB testing). Add support for it in VBoxManage

Location:

trunk/src/VBox/Main/include

Files:

• HostImpl.h (modified) (1 diff)
• USBProxyBackend.h (modified) (12 diffs)
• USBProxyService.h (modified) (5 diffs)

trunk/src/VBox/Main/include/HostImpl.h

@@ -145 +145 @@
     HRESULT generateMACAddress(com::Utf8Str &aAddress);
 
+    HRESULT addUSBDeviceSource(const com::Utf8Str &aBackend, const com::Utf8Str &aId, const com::Utf8Str &aAddress,
+                               const std::vector<com::Utf8Str> &aPropertyNames, const std::vector<com::Utf8Str> &aPropertyValues);
+
+    HRESULT removeUSBDeviceSource(const com::Utf8Str &aId);
+
     // Internal Methods.
 

trunk/src/VBox/Main/include/USBProxyBackend.h

@@ -30 +30 @@
 #include "VirtualBoxImpl.h"
 #include "HostUSBDeviceImpl.h"
+#include "USBProxyBackendWrap.h"
 class USBProxyService;
 
@@ -35 +36 @@
  * Base class for the USB Proxy Backend.
  */
-class USBProxyBackend
-    : public VirtualBoxTranslatable
-{
-public:
-    USBProxyBackend(USBProxyService *pUsbProxyService);
-    virtual int init(void);
-    virtual ~USBProxyBackend();
-
-    /**
-     * Override of the default locking class to be used for validating lock
-     * order with the standard member lock handle.
-     */
-    virtual VBoxLockingClass getLockingClass() const
-    {
-        // the USB proxy service uses the Host object lock, so return the
-        // same locking class as the host
-        return LOCKCLASS_HOSTOBJECT;
-    }
+class ATL_NO_VTABLE USBProxyBackend
+    : public USBProxyBackendWrap
+{
+public:
+
+    DECLARE_EMPTY_CTOR_DTOR (USBProxyBackend)
+
+    HRESULT FinalConstruct();
+    void FinalRelease();
+
+    // public initializer/uninitializer for internal purposes only
+    virtual int init(USBProxyService *pUsbProxyService, const com::Utf8Str &strId, const com::Utf8Str &strAddress);
+    virtual void uninit();
 
     bool isActive(void);
-
-    RWLockHandle *lockHandle() const;
+    const com::Utf8Str &i_getId();
+    uint32_t i_getRefCount();
 
     /** @name Interface for the USBController and the Host object.
@@ -96 +92 @@
     virtual PUSBDEVICE getDevices(void);
     bool updateDeviceStateFake(HostUSBDevice *aDevice, PUSBDEVICE aUSBDevice, bool *aRunFilters, SessionMachine **aIgnoreMachine);
+    uint32_t incRef();
+    uint32_t decRef();
 
     static HRESULT setError(HRESULT aResultCode, const char *aText, ...);
@@ -104 +102 @@
 private:
 
+    // wrapped IUSBProxyBackend properties
+    HRESULT getName(com::Utf8Str &aName);
+    HRESULT getType(com::Utf8Str &aType);
+
     static DECLCALLBACK(int) serviceThread(RTTHREAD Thread, void *pvUser);
 
 protected:
     /** Pointer to the owning USB Proxy Service object. */
-    USBProxyService *m_pUsbProxyService;
+    USBProxyService   *m_pUsbProxyService;
     /** Thread handle of the service thread. */
-    RTTHREAD         mThread;
+    RTTHREAD           mThread;
     /** Flag which stop() sets to cause serviceThread to return. */
-    bool volatile    mTerminate;
+    bool volatile      mTerminate;
+    /** Id of the instance. */
+    const com::Utf8Str m_strId;
+    /** Reference counter which prevents the backend instance from being removed. */
+    uint32_t           m_cRefs;
 };
 
@@ -130 +136 @@
 {
 public:
-    USBProxyBackendDarwin(USBProxyService *pUsbProxyService);
-    int init(void);
-    ~USBProxyBackendDarwin();
+    DECLARE_EMPTY_CTOR_DTOR (USBProxyBackendDarwin)
+
+    int init(USBProxyService *pUsbProxyService, const com::Utf8Str &strId, const com::Utf8Str &strAddress);
+    void uninit();
 
     virtual void *insertFilter(PCUSBFILTER aFilter);
@@ -179 +186 @@
 {
 public:
-    USBProxyBackendLinux(USBProxyService *pUsbProxyService);
-    int init(void);
-    ~USBProxyBackendLinux();
+    DECLARE_EMPTY_CTOR_DTOR (USBProxyBackendLinux)
+
+    int init(USBProxyService *pUsbProxyService, const com::Utf8Str &strId, const com::Utf8Str &strAddress);
+    void uninit();
 
     virtual int captureDevice(HostUSBDevice *aDevice);
@@ -230 +238 @@
 {
 public:
-    USBProxyBackendOs2 (USBProxyService *pUsbProxyService);
-    /// @todo virtual int init(void);
-    ~USBProxyBackendOs2();
+    DECLARE_EMPTY_CTOR_DTOR (USBProxyBackend)
 
     virtual int captureDevice (HostUSBDevice *aDevice);
@@ -272 +278 @@
 {
 public:
-    USBProxyBackendSolaris(USBProxyService *pUsbProxyService);
-    int init(void);
-    ~USBProxyBackendSolaris();
+    DECLARE_EMPTY_CTOR_DTOR (USBProxyBackendSolaris)
+
+    int init(USBProxyService *pUsbProxyService, const com::Utf8Str &strId, const com::Utf8Str &strAddress);
+    void uninit();
 
     virtual void *insertFilter (PCUSBFILTER aFilter);
@@ -305 +312 @@
 {
 public:
-    USBProxyBackendWindows(USBProxyService *pUsbProxyService);
-    int init(void);
-    ~USBProxyBackendWindows();
+    DECLARE_EMPTY_CTOR_DTOR (USBProxyBackendWindows)
+
+    int init(USBProxyService *pUsbProxyService, const com::Utf8Str &strId, const com::Utf8Str &strAddress);
+    void uninit();
 
     virtual void *insertFilter (PCUSBFILTER aFilter);
@@ -334 +342 @@
 {
 public:
-    USBProxyBackendFreeBSD(USBProxyService *pUsbProxyService);
-    int init(void);
-    ~USBProxyBackendFreeBSD();
+    DECLARE_EMPTY_CTOR_DTOR (USBProxyBackendFreeBSD)
+
+    int init(USBProxyService *pUsbProxyService, const com::Utf8Str &strId, const com::Utf8Str &strAddress);
+    void uninit();
 
     virtual int captureDevice(HostUSBDevice *aDevice);
@@ -369 +378 @@
     /** Waiting for the complete reception of a UsbIpExportedDevice structure. */
     kUsbIpRecvState_ExportedDevice,
-    /** Waiting for a complete reception a UsbIpDeviceInterface strucutre to skip. */
+    /** Waiting for a complete reception of a UsbIpDeviceInterface structure to skip. */
     kUsbIpRecvState_DeviceInterface,
     /** 32bit hack. */
@@ -385 +394 @@
 {
 public:
-    USBProxyBackendUsbIp(USBProxyService *pUsbProxyService);
-    int init(void);
-    ~USBProxyBackendUsbIp();
+    DECLARE_EMPTY_CTOR_DTOR (USBProxyBackendUsbIp)
+
+    int init(USBProxyService *pUsbProxyService, const com::Utf8Str &strId, const com::Utf8Str &strAddress);
+    void uninit();
 
     virtual int captureDevice(HostUSBDevice *aDevice);

trunk/src/VBox/Main/include/USBProxyService.h

@@ -51 +51 @@
     }
 
+    void uninit(void);
+
     bool isActive(void);
     int getLastError(void);
@@ -65 +67 @@
      * @{ */
     HRESULT getDeviceCollection(std::vector<ComPtr<IHostUSBDevice> > &aUSBDevices);
+    HRESULT addUSBDeviceSource(const com::Utf8Str &aBackend, const com::Utf8Str &aId, const com::Utf8Str &aAddress,
+                               const std::vector<com::Utf8Str> &aPropertyNames, const std::vector<com::Utf8Str> &aPropertyValues);
+    HRESULT removeUSBDeviceSource(const com::Utf8Str &aId);
     /** @} */
 
@@ -78 +83 @@
 
     void i_updateDeviceList(USBProxyBackend *pUsbProxyBackend, PUSBDEVICE pDevices);
-    void i_getUSBFilters(USBDeviceFilterList *pGlobalFiltes);
+    void i_getUSBFilters(USBDeviceFilterList *pGlobalFilters);
 
 protected:
@@ -84 +89 @@
 
     static HRESULT setError(HRESULT aResultCode, const char *aText, ...);
+
+    USBProxyBackend *findUsbProxyBackendById(const com::Utf8Str &strId);
 
 private:
@@ -94 +101 @@
     HostUSBDeviceList mDevices;
     /** List of USBProxyBackend pointers. */
-    typedef std::list<USBProxyBackend *> USBProxyBackendList;
+    typedef std::list<ComObjPtr<USBProxyBackend> > USBProxyBackendList;
     /** List of active USB backends. */
     USBProxyBackendList mBackends;