Changeset 47376 in vbox

Timestamp:

Jul 24, 2013 3:13:52 PM (11 years ago)

Author:

vboxsync

Message:

Main/USB: USB Controller implementation rework. Moved filter handling into a separate interface

Location:

trunk

Files:

• include/VBox/log.h (modified) (2 diffs)
• src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/VBoxManageUSB.cpp (modified) (6 diffs)
• src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp (modified) (3 diffs)
• src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElements.cpp (modified) (2 diffs)
• src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp (modified) (7 diffs)
• src/VBox/Main/Makefile.kmk (modified) (1 diff)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (10 diffs)
• src/VBox/Main/include/MachineImpl.h (modified) (4 diffs)
• src/VBox/Main/include/USBControllerImpl.h (modified) (2 diffs)
• src/VBox/Main/include/USBDeviceFilterImpl.h (modified) (4 diffs)
• src/VBox/Main/include/USBDeviceFiltersImpl.h (copied) (copied from trunk/src/VBox/Main/include/USBControllerImpl.h ) (6 diffs)
• src/VBox/Main/src-server/MachineImpl.cpp (modified) (17 diffs)
• src/VBox/Main/src-server/SnapshotImpl.cpp (modified) (3 diffs)
• src/VBox/Main/src-server/USBControllerImpl.cpp (modified) (15 diffs)
• src/VBox/Main/src-server/USBDeviceFilterImpl.cpp (modified) (5 diffs)
• src/VBox/Main/src-server/USBDeviceFiltersImpl.cpp (copied) (copied from trunk/src/VBox/Main/src-server/USBControllerImpl.cpp ) (53 diffs)
• src/VBox/Main/src-server/xpcom/server.cpp (modified) (2 diffs)

trunk/include/VBox/log.h

@@ -492 +492 @@
     /** Main group, IUSBDeviceFilter. */
     LOG_GROUP_MAIN_USBDEVICEFILTER,
+    /** Main group, IUSBDeviceFilters. */
+    LOG_GROUP_MAIN_USBDEVICEFILTERS,
     /** Main group, IUSBDeviceStateChangedEvent. */
     LOG_GROUP_MAIN_USBDEVICESTATECHANGEDEVENT,
@@ -893 +895 @@
     "MAIN_USBDEVICE", \
     "MAIN_USBDEVICEFILTER", \
+    "MAIN_USBDEVICEFILTERS", \
     "MAIN_USBDEVICESTATECHANGEDEVENT", \
     "MAIN_VBOXSVCAVAILABILITYCHANGEDEVENT", \

trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp

@@ -1770 +1770 @@
         else
             RTPrintf("EHCI:            %s\n", fEHCIEnabled ? "enabled" : "disabled");
-
+    }
+
+    ComPtr<IUSBDeviceFilters> USBFlts;
+    rc = machine->COMGETTER(USBDeviceFilters)(USBFlts.asOutParam());
+    if (SUCCEEDED(rc))
+    {
         SafeIfaceArray <IUSBDeviceFilter> Coll;
-        rc = USBCtl->COMGETTER(DeviceFilters)(ComSafeArrayAsOutParam(Coll));
+        rc = USBFlts->COMGETTER(DeviceFilters)(ComSafeArrayAsOutParam(Coll));
         if (SUCCEEDED(rc))
         {

trunk/src/VBox/Frontends/VBoxManage/VBoxManageUSB.cpp

@@ -400 +400 @@
 
     ComPtr <IHost> host;
-    ComPtr <IUSBController> ctl;
+    ComPtr <IUSBDeviceFilters> flts;
     if (cmd.mGlobal)
         CHECK_ERROR_RET(a->virtualBox, COMGETTER(Host)(host.asOutParam()), 1);
@@ -409 +409 @@
         /* get the mutable session machine */
         a->session->COMGETTER(Machine)(cmd.mMachine.asOutParam());
-        /* and get the USB controller */
-        CHECK_ERROR_RET(cmd.mMachine, COMGETTER(USBController)(ctl.asOutParam()), 1);
+        /* and get the USB device filters */
+        CHECK_ERROR_RET(cmd.mMachine, COMGETTER(USBDeviceFilters)(flts.asOutParam()), 1);
     }
 
@@ -446 +446 @@
             {
                 ComPtr <IUSBDeviceFilter> flt;
-                CHECK_ERROR_BREAK(ctl, CreateDeviceFilter(f.mName.raw(),
+                CHECK_ERROR_BREAK(flts, CreateDeviceFilter(f.mName.raw(),
                                                           flt.asOutParam()));
 
@@ -466 +466 @@
                     CHECK_ERROR_BREAK(flt, COMSETTER(MaskedInterfaces)(f.mMaskedInterfaces));
 
-                CHECK_ERROR_BREAK(ctl, InsertDeviceFilter(cmd.mIndex, flt));
+                CHECK_ERROR_BREAK(flts, InsertDeviceFilter(cmd.mIndex, flt));
             }
             break;
@@ -502 +502 @@
             {
                 SafeIfaceArray <IUSBDeviceFilter> coll;
-                CHECK_ERROR_BREAK(ctl, COMGETTER(DeviceFilters)(ComSafeArrayAsOutParam(coll)));
+                CHECK_ERROR_BREAK(flts, COMGETTER(DeviceFilters)(ComSafeArrayAsOutParam(coll)));
 
                 ComPtr <IUSBDeviceFilter> flt = coll[cmd.mIndex];
@@ -537 +537 @@
             {
                 ComPtr <IUSBDeviceFilter> flt;
-                CHECK_ERROR_BREAK(ctl, RemoveDeviceFilter(cmd.mIndex, flt.asOutParam()));
+                CHECK_ERROR_BREAK(flts, RemoveDeviceFilter(cmd.mIndex, flt.asOutParam()));
             }
             break;

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -93 +93 @@
 #include "CSystemProperties.h"
 #include "CUSBDevice.h"
+#include "CUSBDeviceFilters.h"
 #include "CUSBDeviceFilter.h"
 #include "CBIOSSettings.h"
@@ -1512 +1513 @@
 
         CUSBController ctl = aMachine.GetUSBController();
+        CUSBDeviceFilters flts = aMachine.GetUSBDeviceFilters();
         if (   !ctl.isNull()
+            && !flts.isNull()
             && ctl.GetProxyAvailable())
         {
@@ -1519 +1522 @@
             if (ctl.GetEnabled())
             {
-                CUSBDeviceFilterVector coll = ctl.GetDeviceFilters();
+                CUSBDeviceFilterVector coll = flts.GetDeviceFilters();
                 uint active = 0;
                 for (int i = 0; i < coll.size(); ++i)

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElements.cpp

@@ -42 +42 @@
 #include "CParallelPort.h"
 #include "CUSBController.h"
+#include "CUSBDeviceFilters.h"
 #include "CUSBDeviceFilter.h"
 #include "CSharedFolder.h"
@@ -891 +892 @@
             if (!ctl.isNull() && ctl.GetProxyAvailable())
             {
-                if (ctl.GetEnabled())
+                const CUSBDeviceFilters &flts = machine().GetUSBDeviceFilters();
+                if (!flts.isNull() && ctl.GetEnabled())
                 {
-                    const CUSBDeviceFilterVector &coll = ctl.GetDeviceFilters();
+                    const CUSBDeviceFilterVector &coll = flts.GetDeviceFilters();
                     uint uActive = 0;
                     for (int i = 0; i < coll.size(); ++i)

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp

@@ -36 +36 @@
 #include "CConsole.h"
 #include "CUSBController.h"
+#include "CUSBDeviceFilters.h"
 #include "CUSBDevice.h"
 #include "CUSBDeviceFilter.h"
@@ -301 +302 @@
 
                 /* For each USB filter: */
-                const CUSBDeviceFilterVector &filters = controller.GetDeviceFilters();
-                for (int iFilterIndex = 0; iFilterIndex < filters.size(); ++iFilterIndex)
+                const CUSBDeviceFilters &filters = m_machine.GetUSBDeviceFilters();
+                if (!filters.isNull())
                 {
-                    /* Prepare USB filter data: */
-                    UIDataSettingsMachineUSBFilter usbFilterData;
-
-                    /* Check if filter is valid: */
-                    const CUSBDeviceFilter &filter = filters[iFilterIndex];
-                    if (!filter.isNull())
+                    const CUSBDeviceFilterVector &coll = filters.GetDeviceFilters();
+                    for (int iFilterIndex = 0; iFilterIndex < coll.size(); ++iFilterIndex)
                     {
-                        usbFilterData.m_fActive = filter.GetActive();
-                        usbFilterData.m_strName = filter.GetName();
-                        usbFilterData.m_strVendorId = filter.GetVendorId();
-                        usbFilterData.m_strProductId = filter.GetProductId();
-                        usbFilterData.m_strRevision = filter.GetRevision();
-                        usbFilterData.m_strManufacturer = filter.GetManufacturer();
-                        usbFilterData.m_strProduct = filter.GetProduct();
-                        usbFilterData.m_strSerialNumber = filter.GetSerialNumber();
-                        usbFilterData.m_strPort = filter.GetPort();
-                        usbFilterData.m_strRemote = filter.GetRemote();
+                        /* Prepare USB filter data: */
+                        UIDataSettingsMachineUSBFilter usbFilterData;
+
+                        /* Check if filter is valid: */
+                        const CUSBDeviceFilter &filter = coll[iFilterIndex];
+                        if (!filter.isNull())
+                        {
+                            usbFilterData.m_fActive = filter.GetActive();
+                            usbFilterData.m_strName = filter.GetName();
+                            usbFilterData.m_strVendorId = filter.GetVendorId();
+                            usbFilterData.m_strProductId = filter.GetProductId();
+                            usbFilterData.m_strRevision = filter.GetRevision();
+                            usbFilterData.m_strManufacturer = filter.GetManufacturer();
+                            usbFilterData.m_strProduct = filter.GetProduct();
+                            usbFilterData.m_strSerialNumber = filter.GetSerialNumber();
+                            usbFilterData.m_strPort = filter.GetPort();
+                            usbFilterData.m_strRemote = filter.GetRemote();
+                        }
+
+                        /* Cache USB filter data: */
+                        m_cache.child(iFilterIndex).cacheInitialData(usbFilterData);
                     }
-
-                    /* Cache USB filter data: */
-                    m_cache.child(iFilterIndex).cacheInitialData(usbFilterData);
                 }
             }
@@ -490 +495 @@
                 {
                     /* Get USB data from cache: */
+                    CUSBDeviceFilters filters = m_machine.GetUSBDeviceFilters();
                     const UIDataSettingsMachineUSB &usbData = m_cache.data();
                     /* Store USB data: */
@@ -498 +504 @@
                     }
                     /* Store USB filters data: */
-                    if (isMachineInValidMode())
+                    if (   isMachineInValidMode()
+                        && !filters.isNull())
                     {
                         /* For each USB filter data set: */
@@ -511 +518 @@
                                 if (usbFilterCache.wasRemoved() || usbFilterCache.wasUpdated())
                                 {
-                                    controller.RemoveDeviceFilter(iOperationPosition);
+                                    filters.RemoveDeviceFilter(iOperationPosition);
                                     if (usbFilterCache.wasRemoved())
                                         --iOperationPosition;
@@ -522 +529 @@
                                     const UIDataSettingsMachineUSBFilter &usbFilterData = usbFilterCache.data();
                                     /* Store USB filter data: */
-                                    CUSBDeviceFilter filter = controller.CreateDeviceFilter(usbFilterData.m_strName);
+                                    CUSBDeviceFilter filter = filters.CreateDeviceFilter(usbFilterData.m_strName);
                                     filter.SetActive(usbFilterData.m_fActive);
                                     filter.SetVendorId(usbFilterData.m_strVendorId);
@@ -532 +539 @@
                                     filter.SetPort(usbFilterData.m_strPort);
                                     filter.SetRemote(usbFilterData.m_strRemote);
-                                    controller.InsertDeviceFilter(iOperationPosition, filter);
+                                    filters.InsertDeviceFilter(iOperationPosition, filter);
                                 }
                             }

trunk/src/VBox/Main/Makefile.kmk

@@ -357 +357 @@
         src-server/SystemPropertiesImpl.cpp \
         src-server/USBControllerImpl.cpp \
+        src-server/USBDeviceFiltersImpl.cpp \
         src-server/VFSExplorerImpl.cpp \
         src-server/VirtualBoxImpl.cpp \

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -4127 +4127 @@
   <interface
     name="IMachine" extends="$unknown"
-    uuid="f6258810-a760-11e2-9e96-0800200c9a66"
+    uuid="00daa773-1d35-40ae-ac06-336aa64959ef"
     wsmap="managed"
     >
@@ -4535 +4535 @@
     </attribute>
 
+    <attribute name="USBDeviceFilters" type="IUSBDeviceFilters" readonly="yes">
+      <desc>
+        Associated USB device filters object.
+
+        <note>
+          If USB functionality is not available in the given edition of
+          VirtualBox, this method will set the result code to @c E_NOTIMPL.
+        </note>
+      </desc>
+    </attribute>
+
     <attribute name="audioAdapter" type="IAudioAdapter" readonly="yes">
       <desc>Associated audio adapter, always present.</desc>
@@ -7614 +7625 @@
         be returned if the host computer refuses to release it for some reason.
 
-        <see><link to="IUSBController::deviceFilters"/>,
+        <see><link to="IUSBDeviceFilters::deviceFilters"/>,
           <link to="USBDeviceState"/></see>
         <result name="VBOX_E_INVALID_VM_STATE">
@@ -7638 +7649 @@
         a possible automatic re-attachment.
 
-        <see><link to="IUSBController::deviceFilters"/>,
+        <see><link to="IUSBDeviceFilters::deviceFilters"/>,
           <link to="USBDeviceState"/></see>
 
@@ -8224 +8235 @@
         Unless the device is ignored by these filters, filters of all
         currently running virtual machines
-        (<link to="IUSBController::deviceFilters"/>) are applied to it.
+        (<link to="IUSBDeviceFilters::deviceFilters"/>) are applied to it.
 
         <note>
@@ -16311 +16322 @@
 
   <!--
-  // IUSBController
+  // IUSBDeviceFilters
   /////////////////////////////////////////////////////////////////////////
   -->
 
   <interface
-    name="IUSBController" extends="$unknown"
-    uuid="01e6f13a-0580-452f-a40f-74e32a5e4921"
+    name="IUSBDeviceFilters" extends="$unknown"
+    uuid="2ab550b2-53cc-4c2e-ae07-0adf4114e75c"
     wsmap="managed"
     >
-    <attribute name="enabled" type="boolean">
-      <desc>
-        Flag whether the USB controller is present in the
-        guest system. If disabled, the virtual guest hardware will
-        not contain any USB controller. Can only be changed when
-        the VM is powered off.
-      </desc>
-    </attribute>
-
-    <attribute name="enabledEHCI" type="boolean">
-      <desc>
-        Flag whether the USB EHCI controller is present in the
-        guest system. If disabled, the virtual guest hardware will
-        not contain a USB EHCI controller. Can only be changed when
-        the VM is powered off.
-      </desc>
-    </attribute>
-
-    <attribute name="proxyAvailable" type="boolean" readonly="yes">
-      <desc>
-        Flag whether there is an USB proxy available.
-      </desc>
-    </attribute>
-
-    <attribute name="USBStandard" type="unsigned short" readonly="yes">
-      <desc>
-        USB standard version which the controller implements.
-        This is a BCD which means that the major version is in the
-        high byte and minor version is in the low byte.
-      </desc>
-    </attribute>
 
     <attribute name="deviceFilters" type="IUSBDeviceFilter" readonly="yes" safearray="yes">
@@ -16464 +16444 @@
       </param>
     </method>
+
+  </interface>
+
+  <!--
+  // IUSBController
+  /////////////////////////////////////////////////////////////////////////
+  -->
+
+  <interface
+    name="IUSBController" extends="$unknown"
+    uuid="f12e6dda-2bad-40c4-8f2e-2d08fe8b74d4"
+    wsmap="managed"
+    >
+    <attribute name="enabled" type="boolean">
+      <desc>
+        Flag whether the USB controller is present in the
+        guest system. If disabled, the virtual guest hardware will
+        not contain any USB controller. Can only be changed when
+        the VM is powered off.
+      </desc>
+    </attribute>
+
+    <attribute name="enabledEHCI" type="boolean">
+      <desc>
+        Flag whether the USB EHCI controller is present in the
+        guest system. If disabled, the virtual guest hardware will
+        not contain a USB EHCI controller. Can only be changed when
+        the VM is powered off.
+      </desc>
+    </attribute>
+
+    <attribute name="proxyAvailable" type="boolean" readonly="yes">
+      <desc>
+        Flag whether there is an USB proxy available.
+      </desc>
+    </attribute>
+
+    <attribute name="USBStandard" type="unsigned short" readonly="yes">
+      <desc>
+        USB standard version which the controller implements.
+        This is a BCD which means that the major version is in the
+        high byte and minor version is in the low byte.
+      </desc>
+    </attribute>
 
   </interface>
@@ -16632 +16656 @@
       </note>
 
-      <see><link to="IUSBController::deviceFilters"/>,
+      <see><link to="IUSBDeviceFilters::deviceFilters"/>,
         <link to="IHostUSBDeviceFilter"/></see>
     </desc>
@@ -16747 +16771 @@
       either ignore the device, or put it to USBDeviceState_Held state, or do
       nothing. Unless the device is ignored by global filters, filters of all
-      currently running guests (<link to="IUSBController::deviceFilters"/>) are
+      currently running guests (<link to="IUSBDeviceFilters::deviceFilters"/>) are
       activated that can put it to USBDeviceState_Captured state.
 
@@ -16878 +16902 @@
         The <link to="IUSBDeviceFilter::remote"/> attribute is ignored by this type of
         filters, because it makes sense only for
-        <link to="IUSBController::deviceFilters">machine USB filters</link>.
+        <link to="IUSBDeviceFilters::deviceFilters">machine USB filters</link>.
       </note>
 

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

@@ -65 +65 @@
 class MachineDebugger;
 class USBController;
+class USBDeviceFilters;
 class Snapshot;
 class SharedFolder;
@@ -457 +458 @@
     STDMETHOD(COMGETTER(AudioAdapter))(IAudioAdapter **audioAdapter);
     STDMETHOD(COMGETTER(USBController))(IUSBController * *aUSBController);
+    STDMETHOD(COMGETTER(USBDeviceFilters))(IUSBDeviceFilters * *aUSBDeviceFilters);
     STDMETHOD(COMGETTER(SettingsFilePath))(BSTR *aFilePath);
     STDMETHOD(COMGETTER(SettingsModified))(BOOL *aModified);
@@ -755 +757 @@
     void getDefaultVideoCaptureFile(Utf8Str &strFile);
 
+    bool isUSBControllerPresent();
+
     HRESULT launchVMProcess(IInternalSessionControl *aControl,
                             const Utf8Str &strType,
@@ -990 +994 @@
     // so they cannot be a part of HWData
 
-    const ComObjPtr<VRDEServer>     mVRDEServer;
-    const ComObjPtr<SerialPort>     mSerialPorts[SchemaDefs::SerialPortCount];
-    const ComObjPtr<ParallelPort>   mParallelPorts[SchemaDefs::ParallelPortCount];
-    const ComObjPtr<AudioAdapter>   mAudioAdapter;
-    const ComObjPtr<USBController>  mUSBController;
-    const ComObjPtr<BIOSSettings>   mBIOSSettings;
+    const ComObjPtr<VRDEServer>        mVRDEServer;
+    const ComObjPtr<SerialPort>        mSerialPorts[SchemaDefs::SerialPortCount];
+    const ComObjPtr<ParallelPort>      mParallelPorts[SchemaDefs::ParallelPortCount];
+    const ComObjPtr<AudioAdapter>      mAudioAdapter;
+    const ComObjPtr<USBController>     mUSBController;
+    const ComObjPtr<USBDeviceFilters>  mUSBDeviceFilters;
+    const ComObjPtr<BIOSSettings>      mBIOSSettings;
     typedef std::vector<ComObjPtr<NetworkAdapter> > NetworkAdapterVector;
     NetworkAdapterVector            mNetworkAdapters;

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

@@ -64 +64 @@
     STDMETHOD(COMGETTER(ProxyAvailable))(BOOL *aEnabled);
     STDMETHOD(COMGETTER(USBStandard))(USHORT *aUSBStandard);
-    STDMETHOD(COMGETTER(DeviceFilters))(ComSafeArrayOut(IUSBDeviceFilter *, aDevicesFilters));
-
-    // IUSBController methods
-    STDMETHOD(CreateDeviceFilter)(IN_BSTR aName, IUSBDeviceFilter **aFilter);
-    STDMETHOD(InsertDeviceFilter)(ULONG aPosition, IUSBDeviceFilter *aFilter);
-    STDMETHOD(RemoveDeviceFilter)(ULONG aPosition, IUSBDeviceFilter **aFilter);
 
     // public methods only for internal purposes
@@ -79 +73 @@
     void commit();
     void copyFrom(USBController *aThat);
-
-#ifdef VBOX_WITH_USB
-    HRESULT onDeviceFilterChange(USBDeviceFilter *aFilter,
-                                 BOOL aActiveChanged = FALSE);
-
-    bool hasMatchingFilter(const ComObjPtr<HostUSBDevice> &aDevice, ULONG *aMaskedIfs);
-    bool hasMatchingFilter(IUSBDevice *aUSBDevice, ULONG *aMaskedIfs);
-
-    HRESULT notifyProxy(bool aInsertFilters);
-#endif /* VBOX_WITH_USB */
-
-    // public methods for internal purposes only
-    // (ensure there is a caller and a read lock before calling them!)
-    Machine* getMachine();
 
 private:

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

@@ -24 +24 @@
 #include <VBox/usbfilter.h>
 
-class USBController;
+class USBDeviceFilters;
 class Host;
 namespace settings
@@ -83 +83 @@
 
     // public initializer/uninitializer for internal purposes only
-    HRESULT init(USBController *aParent,
+    HRESULT init(USBDeviceFilters *aParent,
                  const settings::USBDeviceFilter &data);
-    HRESULT init(USBController *aParent, IN_BSTR aName);
-    HRESULT init(USBController *aParent, USBDeviceFilter *aThat,
+    HRESULT init(USBDeviceFilters *aParent, IN_BSTR aName);
+    HRESULT init(USBDeviceFilters *aParent, USBDeviceFilter *aThat,
                  bool aReshare = false);
-    HRESULT initCopy(USBController *aParent, USBDeviceFilter *aThat);
+    HRESULT initCopy(USBDeviceFilters *aParent, USBDeviceFilter *aThat);
     void uninit();
 
@@ -143 +143 @@
     HRESULT usbFilterFieldSetter(USBFILTERIDX aIdx, const Utf8Str &strNew);
 
-    USBController * const       mParent;
-    USBDeviceFilter * const     mPeer;
+    USBDeviceFilters * const     mParent;
+    USBDeviceFilter  * const     mPeer;
 
     Backupable<Data> mData;
@@ -154 +154 @@
     bool mInList;
 
-    friend class USBController;
+    friend class USBDeviceFilters;
 };
 

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

@@ -3 +3 @@
 /** @file
  *
- * VBox USBController COM Class declaration.
+ * VBox USBDeviceFilters COM Class declaration.
  */
 
 /*
- * Copyright (C) 2005-2012 Oracle Corporation
+ * Copyright (C) 2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -18 +18 @@
  */
 
-#ifndef ____H_USBCONTROLLERIMPL
-#define ____H_USBCONTROLLERIMPL
+#ifndef ____H_USBDEVICEFILTERSIMPL
+#define ____H_USBDEVICEFILTERSIMPL
 
 #include "VirtualBoxBase.h"
@@ -31 +31 @@
 }
 
-class ATL_NO_VTABLE USBController :
+class ATL_NO_VTABLE USBDeviceFilters :
     public VirtualBoxBase,
-    VBOX_SCRIPTABLE_IMPL(IUSBController)
+    VBOX_SCRIPTABLE_IMPL(IUSBDeviceFilters)
 {
 public:
-    VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT(USBController, IUSBController)
+    VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT(USBDeviceFilters, IUSBDeviceFilters)
 
-    DECLARE_NOT_AGGREGATABLE(USBController)
+    DECLARE_NOT_AGGREGATABLE(USBDeviceFilters)
 
     DECLARE_PROTECT_FINAL_CONSTRUCT()
 
     BEGIN_COM_MAP(USBController)
-        VBOX_DEFAULT_INTERFACE_ENTRIES(IUSBController)
+        VBOX_DEFAULT_INTERFACE_ENTRIES(IUSBDeviceFilters)
     END_COM_MAP()
 
-    DECLARE_EMPTY_CTOR_DTOR(USBController)
+    DECLARE_EMPTY_CTOR_DTOR(USBDeviceFilters)
 
     HRESULT FinalConstruct();
@@ -53 +53 @@
     // public initializer/uninitializer for internal purposes only
     HRESULT init(Machine *aParent);
-    HRESULT init(Machine *aParent, USBController *aThat);
-    HRESULT initCopy(Machine *aParent, USBController *aThat);
+    HRESULT init(Machine *aParent, USBDeviceFilters *aThat);
+    HRESULT initCopy(Machine *aParent, USBDeviceFilters *aThat);
     void uninit();
 
-    // IUSBController properties
-    STDMETHOD(COMGETTER(Enabled))(BOOL *aEnabled);
-    STDMETHOD(COMSETTER(Enabled))(BOOL aEnabled);
-    STDMETHOD(COMGETTER(EnabledEHCI))(BOOL *aEnabled);
-    STDMETHOD(COMSETTER(EnabledEHCI))(BOOL aEnabled);
-    STDMETHOD(COMGETTER(ProxyAvailable))(BOOL *aEnabled);
-    STDMETHOD(COMGETTER(USBStandard))(USHORT *aUSBStandard);
+    // IUSBDeviceFilters attributes
     STDMETHOD(COMGETTER(DeviceFilters))(ComSafeArrayOut(IUSBDeviceFilter *, aDevicesFilters));
 
-    // IUSBController methods
+    // IUSBDeviceFilters methods
     STDMETHOD(CreateDeviceFilter)(IN_BSTR aName, IUSBDeviceFilter **aFilter);
     STDMETHOD(InsertDeviceFilter)(ULONG aPosition, IUSBDeviceFilter *aFilter);
@@ -78 +72 @@
     void rollback();
     void commit();
-    void copyFrom(USBController *aThat);
+    void copyFrom(USBDeviceFilters *aThat);
 
 #ifdef VBOX_WITH_USB
@@ -102 +96 @@
 };
 
-#endif //!____H_USBCONTROLLERIMPL
+#endif //!____H_USBDEVICEFILTERSIMPL
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -41 +41 @@
 #include "MediumLock.h"
 #include "USBControllerImpl.h"
+#include "USBDeviceFiltersImpl.h"
 #include "HostImpl.h"
 #include "SharedFolderImpl.h"
@@ -49 +50 @@
 #include "DisplayImpl.h"
 #include "DisplayUtils.h"
-#include "BandwidthControlImpl.h"
 #include "MachineImplCloneVM.h"
 #include "AutostartDb.h"
@@ -2765 +2765 @@
      * (w/o treating it as a failure), for example, as in OSE */
     NOREF(aUSBController);
+    ReturnComNotImplemented();
+#endif /* VBOX_WITH_VUSB */
+}
+
+STDMETHODIMP Machine::COMGETTER(USBDeviceFilters)(IUSBDeviceFilters **aUSBDeviceFilters)
+{
+#ifdef VBOX_WITH_VUSB
+    CheckComArgOutPointerValid(aUSBDeviceFilters);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    clearError();
+    MultiResult rc(S_OK);
+
+# ifdef VBOX_WITH_USB
+    rc = mParent->host()->checkUSBProxyService();
+    if (FAILED(rc)) return rc;
+# endif
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    return rc = mUSBDeviceFilters.queryInterfaceTo(aUSBDeviceFilters);
+#else
+    /* Note: The GUI depends on this method returning E_NOTIMPL with no
+     * extended error info to indicate that USB is simply not available
+     * (w/o treating it as a failure), for example, as in OSE */
+    NOREF(aUSBDeviceFilters);
     ReturnComNotImplemented();
 #endif /* VBOX_WITH_VUSB */
@@ -7706 +7734 @@
     strFile.stripExt();                         // path/to/machinesfolder/vmname/vmname
     strFile.append(".webm");                    // path/to/machinesfolder/vmname/vmname.webm
+}
+
+/**
+ * Returns whether at least one USB controller is present for the VM.
+ */
+bool Machine::isUSBControllerPresent()
+{
+    AutoCaller autoCaller(this);
+    AssertComRCReturn(autoCaller.rc(), false);
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    BOOL fEnabled = FALSE;
+    HRESULT rc = mUSBController->COMGETTER(Enabled)(&fEnabled);
+    if (SUCCEEDED(rc))
+        return !!fEnabled;
+    else
+        return false;
 }
 
@@ -8472 +8518 @@
     mUSBController->init(this);
 
+    /* create the USB device filters object (always present) */
+    unconst(mUSBDeviceFilters).createObject();
+    mUSBDeviceFilters->init(this);
+
     /* create associated network adapter objects */
     mNetworkAdapters.resize(Global::getMaxNetworkAdapters(mHWData->mChipsetType));
@@ -8523 +8573 @@
         mUSBController->uninit();
         unconst(mUSBController).setNull();
+    }
+
+    if (mUSBDeviceFilters)
+    {
+        mUSBDeviceFilters->uninit();
+        unconst(mUSBDeviceFilters).setNull();
     }
 
@@ -9120 +9176 @@
         /* USB Controller */
         rc = mUSBController->loadSettings(data.usbController);
+        if (FAILED(rc)) return rc;
+
+        /* USB device filters */
+        rc = mUSBDeviceFilters->loadSettings(data.usbController);
         if (FAILED(rc)) return rc;
 
@@ -10359 +10419 @@
         if (FAILED(rc)) throw rc;
 
+        /* USB device filters (required) */
+        rc = mUSBDeviceFilters->saveSettings(data.usbController);
+        if (FAILED(rc)) throw rc;
+
         /* Network adapters (required) */
         uint32_t uMaxNICs = RT_MIN(Global::getMaxNetworkAdapters(mHWData->mChipsetType), mNetworkAdapters.size());
@@ -11764 +11828 @@
         mUSBController->rollback();
 
+    if (mUSBDeviceFilters && (mData->flModifications & IsModified_USB))
+        mUSBDeviceFilters->rollback();
+
     if (mBandwidthControl && (mData->flModifications & IsModified_BandwidthControl))
         mBandwidthControl->rollback();
@@ -11868 +11935 @@
     mAudioAdapter->commit();
     mUSBController->commit();
+    mUSBDeviceFilters->commit();
     mBandwidthControl->commit();
 
@@ -12046 +12114 @@
     mAudioAdapter->copyFrom(aThat->mAudioAdapter);
     mUSBController->copyFrom(aThat->mUSBController);
+    mUSBDeviceFilters->copyFrom(aThat->mUSBDeviceFilters);
     mBandwidthControl->copyFrom(aThat->mBandwidthControl);
 
@@ -12474 +12543 @@
     mUSBController->init(this, aMachine->mUSBController);
 
+    /* create another USB device filters object that will be mutable */
+    unconst(mUSBDeviceFilters).createObject();
+    mUSBDeviceFilters->init(this, aMachine->mUSBDeviceFilters);
+
     /* create a list of network adapters that will be mutable */
     mNetworkAdapters.resize(aMachine->mNetworkAdapters.size());
@@ -12579 +12652 @@
          * This is identical to SessionMachine::DetachAllUSBDevices except
          * for the aAbnormal argument. */
-        HRESULT rc = mUSBController->notifyProxy(false /* aInsertFilters */);
+        HRESULT rc = mUSBDeviceFilters->notifyProxy(false /* aInsertFilters */);
         AssertComRC(rc);
         NOREF(rc);
@@ -13043 +13116 @@
 
 #ifdef VBOX_WITH_USB
-    *aMatched = mUSBController->hasMatchingFilter(aUSBDevice, aMaskedIfs);
+    *aMatched = mUSBDeviceFilters->hasMatchingFilter(aUSBDevice, aMaskedIfs);
 #else
     NOREF(aUSBDevice);
@@ -13115 +13188 @@
 
 #ifdef VBOX_WITH_USB
-    HRESULT rc = mUSBController->notifyProxy(true /* aInsertFilters */);
+    HRESULT rc = mUSBDeviceFilters->notifyProxy(true /* aInsertFilters */);
     AssertComRC(rc);
     NOREF(rc);
@@ -13145 +13218 @@
 
 #ifdef VBOX_WITH_USB
-    HRESULT rc = mUSBController->notifyProxy(false /* aInsertFilters */);
+    HRESULT rc = mUSBDeviceFilters->notifyProxy(false /* aInsertFilters */);
     AssertComRC(rc);
     NOREF(rc);
@@ -14121 +14194 @@
          *        elsewhere... */
             alock.release();
-            return mUSBController->hasMatchingFilter(aDevice, aMaskedIfs);
+            return mUSBDeviceFilters->hasMatchingFilter(aDevice, aMaskedIfs);
         default: break;
     }

trunk/src/VBox/Main/src-server/SnapshotImpl.cpp

@@ -30 +30 @@
 #include "SharedFolderImpl.h"
 #include "USBControllerImpl.h"
+#include "USBDeviceFiltersImpl.h"
 #include "VirtualBoxImpl.h"
 
@@ -1079 +1080 @@
     unconst(mUSBController).createObject();
     mUSBController->initCopy(this, pMachine->mUSBController);
+
+    unconst(mUSBDeviceFilters).createObject();
+    mUSBDeviceFilters->initCopy(this, pMachine->mUSBDeviceFilters);
 
     mNetworkAdapters.resize(pMachine->mNetworkAdapters.size());
@@ -1178 +1182 @@
     unconst(mUSBController).createObject();
     mUSBController->init(this);
+
+    unconst(mUSBDeviceFilters).createObject();
+    mUSBDeviceFilters->init(this);
 
     mNetworkAdapters.resize(Global::getMaxNetworkAdapters(mHWData->mChipsetType));

trunk/src/VBox/Main/src-server/USBControllerImpl.cpp

@@ -22 +22 @@
 #include "VirtualBoxImpl.h"
 #include "HostImpl.h"
-#ifdef VBOX_WITH_USB
-# include "USBDeviceImpl.h"
-# include "HostUSBDeviceImpl.h"
-# include "USBProxyService.h"
-# include "USBDeviceFilterImpl.h"
-#endif
 
 #include <iprt/string.h>
@@ -44 +38 @@
 // defines
 /////////////////////////////////////////////////////////////////////////////
-
-typedef std::list< ComObjPtr<USBDeviceFilter> > DeviceFilterList;
 
 struct BackupableUSBData
@@ -61 +53 @@
 {
     Data(Machine *pMachine)
-        : pParent(pMachine),
-          pHost(pMachine->getVirtualBox()->host())
+        : pParent(pMachine)
     { }
 
@@ -69 +60 @@
 
     Machine * const                 pParent;
-    Host * const                    pHost;
 
     // peer machine's USB controller
@@ -75 +65 @@
 
     Backupable<BackupableUSBData>   bd;
-#ifdef VBOX_WITH_USB
-    // the following fields need special backup/rollback/commit handling,
-    // so they cannot be a part of BackupableData
-    Backupable<DeviceFilterList>    llDeviceFilters;
-#endif
 };
 
@@ -124 +109 @@
 
     m->bd.allocate();
-#ifdef VBOX_WITH_USB
-    m->llDeviceFilters.allocate();
-#endif
 
     /* Confirm a successful initialization */
@@ -163 +145 @@
     m->bd.share(aPeer->m->bd);
 
-#ifdef VBOX_WITH_USB
-    /* create copies of all filters */
-    m->llDeviceFilters.allocate();
-    DeviceFilterList::const_iterator it = aPeer->m->llDeviceFilters->begin();
-    while (it != aPeer->m->llDeviceFilters->end())
-    {
-        ComObjPtr<USBDeviceFilter> filter;
-        filter.createObject();
-        filter->init(this, *it);
-        m->llDeviceFilters->push_back(filter);
-        ++it;
-    }
-#endif /* VBOX_WITH_USB */
-
     /* Confirm a successful initialization */
     autoInitSpan.setSucceeded();
@@ -205 +173 @@
     AutoWriteLock thatlock(aPeer COMMA_LOCKVAL_SRC_POS);
     m->bd.attachCopy(aPeer->m->bd);
-
-#ifdef VBOX_WITH_USB
-    /* create private copies of all filters */
-    m->llDeviceFilters.allocate();
-    DeviceFilterList::const_iterator it = aPeer->m->llDeviceFilters->begin();
-    while (it != aPeer->m->llDeviceFilters->end())
-    {
-        ComObjPtr<USBDeviceFilter> filter;
-        filter.createObject();
-        filter->initCopy(this, *it);
-        m->llDeviceFilters->push_back(filter);
-        ++it;
-    }
-#endif /* VBOX_WITH_USB */
 
     /* Confirm a successful initialization */
@@ -240 +194 @@
         return;
 
-#ifdef VBOX_WITH_USB
-    // uninit all device filters on the list (it's a standard std::list not an ObjectsList
-    // so we must uninit() manually)
-    for (DeviceFilterList::iterator it = m->llDeviceFilters->begin();
-         it != m->llDeviceFilters->end();
-         ++it)
-        (*it)->uninit();
-
-    m->llDeviceFilters.free();
-#endif
     m->bd.free();
 
@@ -385 +329 @@
 
     return S_OK;
-}
-
-#ifndef VBOX_WITH_USB
-/**
- * Fake class for build without USB.
- * We need an empty collection & enum for deviceFilters, that's all.
- */
-class ATL_NO_VTABLE USBDeviceFilter :
-    public VirtualBoxBase,
-    VBOX_SCRIPTABLE_IMPL(IUSBDeviceFilter)
-{
-public:
-    DECLARE_NOT_AGGREGATABLE(USBDeviceFilter)
-    DECLARE_PROTECT_FINAL_CONSTRUCT()
-    BEGIN_COM_MAP(USBDeviceFilter)
-        VBOX_DEFAULT_INTERFACE_ENTRIES(IUSBDeviceFilter)
-    END_COM_MAP()
-
-    DECLARE_EMPTY_CTOR_DTOR(USBDeviceFilter)
-
-    // IUSBDeviceFilter properties
-    STDMETHOD(COMGETTER(Name))(BSTR *aName);
-    STDMETHOD(COMSETTER(Name))(IN_BSTR aName);
-    STDMETHOD(COMGETTER(Active))(BOOL *aActive);
-    STDMETHOD(COMSETTER(Active))(BOOL aActive);
-    STDMETHOD(COMGETTER(VendorId))(BSTR *aVendorId);
-    STDMETHOD(COMSETTER(VendorId))(IN_BSTR aVendorId);
-    STDMETHOD(COMGETTER(ProductId))(BSTR *aProductId);
-    STDMETHOD(COMSETTER(ProductId))(IN_BSTR aProductId);
-    STDMETHOD(COMGETTER(Revision))(BSTR *aRevision);
-    STDMETHOD(COMSETTER(Revision))(IN_BSTR aRevision);
-    STDMETHOD(COMGETTER(Manufacturer))(BSTR *aManufacturer);
-    STDMETHOD(COMSETTER(Manufacturer))(IN_BSTR aManufacturer);
-    STDMETHOD(COMGETTER(Product))(BSTR *aProduct);
-    STDMETHOD(COMSETTER(Product))(IN_BSTR aProduct);
-    STDMETHOD(COMGETTER(SerialNumber))(BSTR *aSerialNumber);
-    STDMETHOD(COMSETTER(SerialNumber))(IN_BSTR aSerialNumber);
-    STDMETHOD(COMGETTER(Port))(BSTR *aPort);
-    STDMETHOD(COMSETTER(Port))(IN_BSTR aPort);
-    STDMETHOD(COMGETTER(Remote))(BSTR *aRemote);
-    STDMETHOD(COMSETTER(Remote))(IN_BSTR aRemote);
-    STDMETHOD(COMGETTER(MaskedInterfaces))(ULONG *aMaskedIfs);
-    STDMETHOD(COMSETTER(MaskedInterfaces))(ULONG aMaskedIfs);
-};
-#endif /* !VBOX_WITH_USB */
-
-
-STDMETHODIMP USBController::COMGETTER(DeviceFilters)(ComSafeArrayOut(IUSBDeviceFilter *, aDevicesFilters))
-{
-#ifdef VBOX_WITH_USB
-    CheckComArgOutSafeArrayPointerValid(aDevicesFilters);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    SafeIfaceArray<IUSBDeviceFilter> collection(*m->llDeviceFilters.data());
-    collection.detachTo(ComSafeArrayOutArg(aDevicesFilters));
-
-    return S_OK;
-#else
-    NOREF(aDevicesFilters);
-# ifndef RT_OS_WINDOWS
-    NOREF(aDevicesFiltersSize);
-# endif
-    ReturnComNotImplemented();
-#endif
-}
-
-// IUSBController methods
-/////////////////////////////////////////////////////////////////////////////
-
-STDMETHODIMP USBController::CreateDeviceFilter(IN_BSTR aName,
-                                               IUSBDeviceFilter **aFilter)
-{
-#ifdef VBOX_WITH_USB
-    CheckComArgOutPointerValid(aFilter);
-
-    CheckComArgStrNotEmptyOrNull(aName);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    /* the machine needs to be mutable */
-    AutoMutableStateDependency adep(m->pParent);
-    if (FAILED(adep.rc())) return adep.rc();
-
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    ComObjPtr<USBDeviceFilter> filter;
-    filter.createObject();
-    HRESULT rc = filter->init(this, aName);
-    ComAssertComRCRetRC(rc);
-    rc = filter.queryInterfaceTo(aFilter);
-    AssertComRCReturnRC(rc);
-
-    return S_OK;
-#else
-    NOREF(aName);
-    NOREF(aFilter);
-    ReturnComNotImplemented();
-#endif
-}
-
-STDMETHODIMP USBController::InsertDeviceFilter(ULONG aPosition,
-                                               IUSBDeviceFilter *aFilter)
-{
-#ifdef VBOX_WITH_USB
-
-    CheckComArgNotNull(aFilter);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    /* the machine needs to be mutable */
-    AutoMutableStateDependency adep(m->pParent);
-    if (FAILED(adep.rc())) return adep.rc();
-
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    ComObjPtr<USBDeviceFilter> filter = static_cast<USBDeviceFilter*>(aFilter);
-    // @todo r=dj make sure the input object is actually from us
-//     if (!filter)
-//         return setError(E_INVALIDARG,
-//             tr("The given USB device filter is not created within "
-//                 "this VirtualBox instance"));
-
-    if (filter->mInList)
-        return setError(VBOX_E_INVALID_OBJECT_STATE,
-                        tr("The given USB device filter is already in the list"));
-
-    /* backup the list before modification */
-    m->llDeviceFilters.backup();
-
-    /* iterate to the position... */
-    DeviceFilterList::iterator it;
-    if (aPosition < m->llDeviceFilters->size())
-    {
-        it = m->llDeviceFilters->begin();
-        std::advance(it, aPosition);
-    }
-    else
-        it = m->llDeviceFilters->end();
-    /* ...and insert */
-    m->llDeviceFilters->insert(it, filter);
-    filter->mInList = true;
-
-    /* notify the proxy (only when it makes sense) */
-    if (filter->getData().mActive && Global::IsOnline(adep.machineState())
-        && filter->getData().mRemote.isMatch(false))
-    {
-        USBProxyService *service = m->pHost->usbProxyService();
-        ComAssertRet(service, E_FAIL);
-
-        ComAssertRet(filter->getId() == NULL, E_FAIL);
-        filter->getId() = service->insertFilter(&filter->getData().mUSBFilter);
-    }
-
-    alock.release();
-    AutoWriteLock mlock(m->pParent COMMA_LOCKVAL_SRC_POS);
-    m->pParent->setModified(Machine::IsModified_USB);
-    mlock.release();
-
-    return S_OK;
-
-#else /* VBOX_WITH_USB */
-
-    NOREF(aPosition);
-    NOREF(aFilter);
-    ReturnComNotImplemented();
-
-#endif /* VBOX_WITH_USB */
-}
-
-STDMETHODIMP USBController::RemoveDeviceFilter(ULONG aPosition,
-                                               IUSBDeviceFilter **aFilter)
-{
-#ifdef VBOX_WITH_USB
-
-    CheckComArgOutPointerValid(aFilter);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    /* the machine needs to be mutable */
-    AutoMutableStateDependency adep(m->pParent);
-    if (FAILED(adep.rc())) return adep.rc();
-
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    if (!m->llDeviceFilters->size())
-        return setError(E_INVALIDARG,
-                        tr("The USB device filter list is empty"));
-
-    if (aPosition >= m->llDeviceFilters->size())
-        return setError(E_INVALIDARG,
-                        tr("Invalid position: %lu (must be in range [0, %lu])"),
-                        aPosition, m->llDeviceFilters->size() - 1);
-
-    /* backup the list before modification */
-    m->llDeviceFilters.backup();
-
-    ComObjPtr<USBDeviceFilter> filter;
-    {
-        /* iterate to the position... */
-        DeviceFilterList::iterator it = m->llDeviceFilters->begin();
-        std::advance(it, aPosition);
-        /* ...get an element from there... */
-        filter = *it;
-        /* ...and remove */
-        filter->mInList = false;
-        m->llDeviceFilters->erase(it);
-    }
-
-    /* cancel sharing (make an independent copy of data) */
-    filter->unshare();
-
-    filter.queryInterfaceTo(aFilter);
-
-    /* notify the proxy (only when it makes sense) */
-    if (filter->getData().mActive && Global::IsOnline(adep.machineState())
-        && filter->getData().mRemote.isMatch(false))
-    {
-        USBProxyService *service = m->pHost->usbProxyService();
-        ComAssertRet(service, E_FAIL);
-
-        ComAssertRet(filter->getId() != NULL, E_FAIL);
-        service->removeFilter(filter->getId());
-        filter->getId() = NULL;
-    }
-
-    alock.release();
-    AutoWriteLock mlock(m->pParent COMMA_LOCKVAL_SRC_POS);
-    m->pParent->setModified(Machine::IsModified_USB);
-    mlock.release();
-
-    return S_OK;
-
-#else /* VBOX_WITH_USB */
-
-    NOREF(aPosition);
-    NOREF(aFilter);
-    ReturnComNotImplemented();
-
-#endif /* VBOX_WITH_USB */
 }
 
@@ -663 +361 @@
     m->bd->fEnabledEHCI = data.fEnabledEHCI;
 
-#ifdef VBOX_WITH_USB
-    for (settings::USBDeviceFiltersList::const_iterator it = data.llDeviceFilters.begin();
-         it != data.llDeviceFilters.end();
-         ++it)
-    {
-        const settings::USBDeviceFilter &f = *it;
-        ComObjPtr<USBDeviceFilter> pFilter;
-        pFilter.createObject();
-        HRESULT rc = pFilter->init(this,        // parent
-                                   f);
-        if (FAILED(rc)) return rc;
-
-        m->llDeviceFilters->push_back(pFilter);
-        pFilter->mInList = true;
-    }
-#endif /* VBOX_WITH_USB */
-
     return S_OK;
 }
@@ -699 +380 @@
     data.fEnabled = !!m->bd->fEnabled;
     data.fEnabledEHCI = !!m->bd->fEnabledEHCI;
-
-#ifdef VBOX_WITH_USB
-    data.llDeviceFilters.clear();
-
-    for (DeviceFilterList::const_iterator it = m->llDeviceFilters->begin();
-         it != m->llDeviceFilters->end();
-         ++it)
-    {
-        AutoWriteLock filterLock(*it COMMA_LOCKVAL_SRC_POS);
-        const USBDeviceFilter::Data &filterData = (*it)->getData();
-
-        Bstr str;
-
-        settings::USBDeviceFilter f;
-        f.strName = filterData.mName;
-        f.fActive = !!filterData.mActive;
-        (*it)->COMGETTER(VendorId)(str.asOutParam());
-        f.strVendorId = str;
-        (*it)->COMGETTER(ProductId)(str.asOutParam());
-        f.strProductId = str;
-        (*it)->COMGETTER(Revision)(str.asOutParam());
-        f.strRevision = str;
-        (*it)->COMGETTER(Manufacturer)(str.asOutParam());
-        f.strManufacturer = str;
-        (*it)->COMGETTER(Product)(str.asOutParam());
-        f.strProduct = str;
-        (*it)->COMGETTER(SerialNumber)(str.asOutParam());
-        f.strSerialNumber = str;
-        (*it)->COMGETTER(Port)(str.asOutParam());
-        f.strPort = str;
-        f.strRemote = filterData.mRemote.string();
-        f.ulMaskedInterfaces = filterData.mMaskedIfs;
-
-        data.llDeviceFilters.push_back(f);
-    }
-#endif /* VBOX_WITH_USB */
 
     return S_OK;
@@ -752 +397 @@
 
     m->bd.rollback();
-
-#ifdef VBOX_WITH_USB
-
-    if (m->llDeviceFilters.isBackedUp())
-    {
-        USBProxyService *service = m->pHost->usbProxyService();
-        Assert(service);
-
-        /* uninitialize all new filters (absent in the backed up list) */
-        DeviceFilterList::const_iterator it = m->llDeviceFilters->begin();
-        DeviceFilterList *backedList = m->llDeviceFilters.backedUpData();
-        while (it != m->llDeviceFilters->end())
-        {
-            if (std::find(backedList->begin(), backedList->end(), *it) ==
-                backedList->end())
-            {
-                /* notify the proxy (only when it makes sense) */
-                if ((*it)->getData().mActive &&
-                    Global::IsOnline(adep.machineState())
-                    && (*it)->getData().mRemote.isMatch(false))
-                {
-                    USBDeviceFilter *filter = *it;
-                    Assert(filter->getId() != NULL);
-                    service->removeFilter(filter->getId());
-                    filter->getId() = NULL;
-                }
-
-                (*it)->uninit();
-            }
-            ++it;
-        }
-
-        if (Global::IsOnline(adep.machineState()))
-        {
-            /* find all removed old filters (absent in the new list)
-             * and insert them back to the USB proxy */
-            it = backedList->begin();
-            while (it != backedList->end())
-            {
-                if (std::find(m->llDeviceFilters->begin(), m->llDeviceFilters->end(), *it) ==
-                    m->llDeviceFilters->end())
-                {
-                    /* notify the proxy (only when necessary) */
-                    if ((*it)->getData().mActive
-                            && (*it)->getData().mRemote.isMatch(false))
-                    {
-                        USBDeviceFilter *flt = *it; /* resolve ambiguity */
-                        Assert(flt->getId() == NULL);
-                        flt->getId() = service->insertFilter(&flt->getData().mUSBFilter);
-                    }
-                }
-                ++it;
-            }
-        }
-
-        /* restore the list */
-        m->llDeviceFilters.rollback();
-    }
-
-    /* here we don't depend on the machine state any more */
-    adep.release();
-
-    /* rollback any changes to filters after restoring the list */
-    DeviceFilterList::const_iterator it = m->llDeviceFilters->begin();
-    while (it != m->llDeviceFilters->end())
-    {
-        if ((*it)->isModified())
-        {
-            (*it)->rollback();
-            /* call this to notify the USB proxy about changes */
-            onDeviceFilterChange(*it);
-        }
-        ++it;
-    }
-
-#endif /* VBOX_WITH_USB */
 }
 
@@ -858 +427 @@
         }
     }
-
-#ifdef VBOX_WITH_USB
-    bool commitFilters = false;
-
-    if (m->llDeviceFilters.isBackedUp())
-    {
-        m->llDeviceFilters.commit();
-
-        /* apply changes to peer */
-        if (m->pPeer)
-        {
-            AutoWriteLock peerlock(m->pPeer COMMA_LOCKVAL_SRC_POS);
-
-            /* commit all changes to new filters (this will reshare data with
-             * peers for those who have peers) */
-            DeviceFilterList *newList = new DeviceFilterList();
-            DeviceFilterList::const_iterator it = m->llDeviceFilters->begin();
-            while (it != m->llDeviceFilters->end())
-            {
-                (*it)->commit();
-
-                /* look if this filter has a peer filter */
-                ComObjPtr<USBDeviceFilter> peer = (*it)->peer();
-                if (!peer)
-                {
-                    /* no peer means the filter is a newly created one;
-                     * create a peer owning data this filter share it with */
-                    peer.createObject();
-                    peer->init(m->pPeer, *it, true /* aReshare */);
-                }
-                else
-                {
-                    /* remove peer from the old list */
-                    m->pPeer->m->llDeviceFilters->remove(peer);
-                }
-                /* and add it to the new list */
-                newList->push_back(peer);
-
-                ++it;
-            }
-
-            /* uninit old peer's filters that are left */
-            it = m->pPeer->m->llDeviceFilters->begin();
-            while (it != m->pPeer->m->llDeviceFilters->end())
-            {
-                (*it)->uninit();
-                ++it;
-            }
-
-            /* attach new list of filters to our peer */
-            m->pPeer->m->llDeviceFilters.attach(newList);
-        }
-        else
-        {
-            /* we have no peer (our parent is the newly created machine);
-             * just commit changes to filters */
-            commitFilters = true;
-        }
-    }
-    else
-    {
-        /* the list of filters itself is not changed,
-         * just commit changes to filters themselves */
-        commitFilters = true;
-    }
-
-    if (commitFilters)
-    {
-        DeviceFilterList::const_iterator it = m->llDeviceFilters->begin();
-        while (it != m->llDeviceFilters->end())
-        {
-            (*it)->commit();
-            ++it;
-        }
-    }
-#endif /* VBOX_WITH_USB */
 }
 
@@ -965 +458 @@
     /* this will back up current data */
     m->bd.assignCopy(aThat->m->bd);
-
-#ifdef VBOX_WITH_USB
-
-    /* Note that we won't inform the USB proxy about new filters since the VM is
-     * not running when we are here and therefore no need to do so */
-
-    /* create private copies of all filters */
-    m->llDeviceFilters.backup();
-    m->llDeviceFilters->clear();
-    for (DeviceFilterList::const_iterator it = aThat->m->llDeviceFilters->begin();
-        it != aThat->m->llDeviceFilters->end();
-        ++it)
-    {
-        ComObjPtr<USBDeviceFilter> filter;
-        filter.createObject();
-        filter->initCopy(this, *it);
-        m->llDeviceFilters->push_back(filter);
-    }
-
-#endif /* VBOX_WITH_USB */
-}
-
-#ifdef VBOX_WITH_USB
-
-/**
- *  Called by setter methods of all USB device filters.
- *
- *  @note Locks nothing.
- */
-HRESULT USBController::onDeviceFilterChange(USBDeviceFilter *aFilter,
-                                            BOOL aActiveChanged /* = FALSE */)
-{
-    AutoCaller autoCaller(this);
-    AssertComRCReturnRC(autoCaller.rc());
-
-    /* we need the machine state */
-    AutoAnyStateDependency adep(m->pParent);
-    AssertComRCReturnRC(adep.rc());
-
-    /* nothing to do if the machine isn't running */
-    if (!Global::IsOnline(adep.machineState()))
-        return S_OK;
-
-    /* we don't modify our data fields -- no need to lock */
-
-    if (    aFilter->mInList
-         && m->pParent->isRegistered())
-    {
-        USBProxyService *service = m->pHost->usbProxyService();
-        ComAssertRet(service, E_FAIL);
-
-        if (aActiveChanged)
-        {
-            if (aFilter->getData().mRemote.isMatch(false))
-            {
-                /* insert/remove the filter from the proxy */
-                if (aFilter->getData().mActive)
-                {
-                    ComAssertRet(aFilter->getId() == NULL, E_FAIL);
-                    aFilter->getId() = service->insertFilter(&aFilter->getData().mUSBFilter);
-                }
-                else
-                {
-                    ComAssertRet(aFilter->getId() != NULL, E_FAIL);
-                    service->removeFilter(aFilter->getId());
-                    aFilter->getId() = NULL;
-                }
-            }
-        }
-        else
-        {
-            if (aFilter->getData().mActive)
-            {
-                /* update the filter in the proxy */
-                ComAssertRet(aFilter->getId() != NULL, E_FAIL);
-                service->removeFilter(aFilter->getId());
-                if (aFilter->getData().mRemote.isMatch(false))
-                {
-                    aFilter->getId() = service->insertFilter(&aFilter->getData().mUSBFilter);
-                }
-            }
-        }
-    }
-
-    return S_OK;
-}
-
-/**
- *  Returns true if the given USB device matches to at least one of
- *  this controller's USB device filters.
- *
- *  A HostUSBDevice specific version.
- *
- *  @note Locks this object for reading.
- */
-bool USBController::hasMatchingFilter(const ComObjPtr<HostUSBDevice> &aDevice, ULONG *aMaskedIfs)
-{
-    AutoCaller autoCaller(this);
-    AssertComRCReturn(autoCaller.rc(), false);
-
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    /* Disabled USB controllers cannot actually work with USB devices */
-    if (!m->bd->fEnabled)
-        return false;
-
-    /* apply self filters */
-    for (DeviceFilterList::const_iterator it = m->llDeviceFilters->begin();
-         it != m->llDeviceFilters->end();
-         ++it)
-    {
-        AutoWriteLock filterLock(*it COMMA_LOCKVAL_SRC_POS);
-        if (aDevice->isMatch((*it)->getData()))
-        {
-            *aMaskedIfs = (*it)->getData().mMaskedIfs;
-            return true;
-        }
-    }
-
-    return false;
-}
-
-/**
- *  Returns true if the given USB device matches to at least one of
- *  this controller's USB device filters.
- *
- *  A generic version that accepts any IUSBDevice on input.
- *
- *  @note
- *      This method MUST correlate with HostUSBDevice::isMatch()
- *      in the sense of the device matching logic.
- *
- *  @note Locks this object for reading.
- */
-bool USBController::hasMatchingFilter(IUSBDevice *aUSBDevice, ULONG *aMaskedIfs)
-{
-    LogFlowThisFuncEnter();
-
-    AutoCaller autoCaller(this);
-    AssertComRCReturn(autoCaller.rc(), false);
-
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    /* Disabled USB controllers cannot actually work with USB devices */
-    if (!m->bd->fEnabled)
-        return false;
-
-    HRESULT rc = S_OK;
-
-    /* query fields */
-    USBFILTER dev;
-    USBFilterInit(&dev, USBFILTERTYPE_CAPTURE);
-
-    USHORT vendorId = 0;
-    rc = aUSBDevice->COMGETTER(VendorId)(&vendorId);
-    ComAssertComRCRet(rc, false);
-    ComAssertRet(vendorId, false);
-    int vrc = USBFilterSetNumExact(&dev, USBFILTERIDX_VENDOR_ID, vendorId, true); AssertRC(vrc);
-
-    USHORT productId = 0;
-    rc = aUSBDevice->COMGETTER(ProductId)(&productId);
-    ComAssertComRCRet(rc, false);
-    vrc = USBFilterSetNumExact(&dev, USBFILTERIDX_PRODUCT_ID, productId, true); AssertRC(vrc);
-
-    USHORT revision;
-    rc = aUSBDevice->COMGETTER(Revision)(&revision);
-    ComAssertComRCRet(rc, false);
-    vrc = USBFilterSetNumExact(&dev, USBFILTERIDX_DEVICE, revision, true); AssertRC(vrc);
-
-    Bstr manufacturer;
-    rc = aUSBDevice->COMGETTER(Manufacturer)(manufacturer.asOutParam());
-    ComAssertComRCRet(rc, false);
-    if (!manufacturer.isEmpty())
-        USBFilterSetStringExact(&dev, USBFILTERIDX_MANUFACTURER_STR, Utf8Str(manufacturer).c_str(), true);
-
-    Bstr product;
-    rc = aUSBDevice->COMGETTER(Product)(product.asOutParam());
-    ComAssertComRCRet(rc, false);
-    if (!product.isEmpty())
-        USBFilterSetStringExact(&dev, USBFILTERIDX_PRODUCT_STR, Utf8Str(product).c_str(), true);
-
-    Bstr serialNumber;
-    rc = aUSBDevice->COMGETTER(SerialNumber)(serialNumber.asOutParam());
-    ComAssertComRCRet(rc, false);
-    if (!serialNumber.isEmpty())
-        USBFilterSetStringExact(&dev, USBFILTERIDX_SERIAL_NUMBER_STR, Utf8Str(serialNumber).c_str(), true);
-
-    Bstr address;
-    rc = aUSBDevice->COMGETTER(Address)(address.asOutParam());
-    ComAssertComRCRet(rc, false);
-
-    USHORT port = 0;
-    rc = aUSBDevice->COMGETTER(Port)(&port);
-    ComAssertComRCRet(rc, false);
-    USBFilterSetNumExact(&dev, USBFILTERIDX_PORT, port, true);
-
-    BOOL remote = FALSE;
-    rc = aUSBDevice->COMGETTER(Remote)(&remote);
-    ComAssertComRCRet(rc, false);
-    ComAssertRet(remote == TRUE, false);
-
-    bool match = false;
-
-    /* apply self filters */
-    for (DeviceFilterList::const_iterator it = m->llDeviceFilters->begin();
-         it != m->llDeviceFilters->end();
-         ++it)
-    {
-        AutoWriteLock filterLock(*it COMMA_LOCKVAL_SRC_POS);
-        const USBDeviceFilter::Data &aData = (*it)->getData();
-
-        if (!aData.mActive)
-            continue;
-        if (!aData.mRemote.isMatch(remote))
-            continue;
-        if (!USBFilterMatch(&aData.mUSBFilter, &dev))
-            continue;
-
-        match = true;
-        *aMaskedIfs = aData.mMaskedIfs;
-        break;
-    }
-
-    LogFlowThisFunc(("returns: %d\n", match));
-    LogFlowThisFuncLeave();
-
-    return match;
-}
-
-/**
- *  Notifies the proxy service about all filters as requested by the
- *  @a aInsertFilters argument.
- *
- *  @param aInsertFilters   @c true to insert filters, @c false to remove.
- *
- *  @note Locks this object for reading.
- */
-HRESULT USBController::notifyProxy(bool aInsertFilters)
-{
-    LogFlowThisFunc(("aInsertFilters=%RTbool\n", aInsertFilters));
-
-    AutoCaller autoCaller(this);
-    AssertComRCReturn(autoCaller.rc(), false);
-
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    USBProxyService *service = m->pHost->usbProxyService();
-    AssertReturn(service, E_FAIL);
-
-    DeviceFilterList::const_iterator it = m->llDeviceFilters->begin();
-    while (it != m->llDeviceFilters->end())
-    {
-        USBDeviceFilter *flt = *it; /* resolve ambiguity (for ComPtr below) */
-
-        /* notify the proxy (only if the filter is active) */
-        if (   flt->getData().mActive
-            && flt->getData().mRemote.isMatch(false) /* and if the filter is NOT remote */
-           )
-        {
-            if (aInsertFilters)
-            {
-                AssertReturn(flt->getId() == NULL, E_FAIL);
-                flt->getId() = service->insertFilter(&flt->getData().mUSBFilter);
-            }
-            else
-            {
-                /* It's possible that the given filter was not inserted the proxy
-                 * when this method gets called (as a result of an early VM
-                 * process crash for example. So, don't assert that ID != NULL. */
-                if (flt->getId() != NULL)
-                {
-                    service->removeFilter(flt->getId());
-                    flt->getId() = NULL;
-                }
-            }
-        }
-        ++it;
-    }
-
-    return S_OK;
-}
-
-Machine* USBController::getMachine()
-{
-    return m->pParent;
-}
-
-#endif /* VBOX_WITH_USB */
+}
 
 // private methods

trunk/src/VBox/Main/src-server/USBDeviceFilterImpl.cpp

@@ -17 +17 @@
 
 #include "USBDeviceFilterImpl.h"
-#include "USBControllerImpl.h"
+#include "USBDeviceFiltersImpl.h"
 #include "MachineImpl.h"
 #include "HostImpl.h"
@@ -204 +204 @@
  *  @param aParent  Handle of the parent object.
  */
-HRESULT USBDeviceFilter::init(USBController *aParent,
+HRESULT USBDeviceFilter::init(USBDeviceFilters *aParent,
                               const settings::USBDeviceFilter &data)
 {
@@ -278 +278 @@
  *  @param aParent  Handle of the parent object.
  */
-HRESULT USBDeviceFilter::init(USBController *aParent, IN_BSTR aName)
+HRESULT USBDeviceFilter::init(USBDeviceFilters *aParent, IN_BSTR aName)
 {
     LogFlowThisFunc(("aParent=%p\n", aParent));
@@ -327 +327 @@
  *  reading if @a aReshare is false.
  */
-HRESULT USBDeviceFilter::init (USBController *aParent, USBDeviceFilter *aThat,
+HRESULT USBDeviceFilter::init (USBDeviceFilters *aParent, USBDeviceFilter *aThat,
                                bool aReshare /* = false */)
 {
@@ -380 +380 @@
  *  @note Locks @a aThat object for reading.
  */
-HRESULT USBDeviceFilter::initCopy (USBController *aParent, USBDeviceFilter *aThat)
+HRESULT USBDeviceFilter::initCopy (USBDeviceFilters *aParent, USBDeviceFilter *aThat)
 {
     LogFlowThisFunc(("aParent=%p, aThat=%p\n", aParent, aThat));

trunk/src/VBox/Main/src-server/USBDeviceFiltersImpl.cpp

@@ -16 +16 @@
  */
 
-#include "USBControllerImpl.h"
+#include "USBDeviceFiltersImpl.h"
 
 #include "Global.h"
@@ -47 +47 @@
 typedef std::list< ComObjPtr<USBDeviceFilter> > DeviceFilterList;
 
-struct BackupableUSBData
-{
-    BackupableUSBData()
-        : fEnabled(false),
-          fEnabledEHCI(false)
-    { }
-
-    BOOL fEnabled;
-    BOOL fEnabledEHCI;
-};
-
-struct USBController::Data
+struct USBDeviceFilters::Data
 {
     Data(Machine *pMachine)
@@ -71 +60 @@
     Host * const                    pHost;
 
-    // peer machine's USB controller
-    const ComObjPtr<USBController>  pPeer;
-
-    Backupable<BackupableUSBData>   bd;
-#ifdef VBOX_WITH_USB
-    // the following fields need special backup/rollback/commit handling,
-    // so they cannot be a part of BackupableData
+    // peer machine's USB device filters list
+    const ComObjPtr<USBDeviceFilters>  pPeer;
+
+#ifdef VBOX_WITH_USB
+    // List of device filters.
     Backupable<DeviceFilterList>    llDeviceFilters;
 #endif
@@ -87 +74 @@
 /////////////////////////////////////////////////////////////////////////////
 
-DEFINE_EMPTY_CTOR_DTOR(USBController)
-
-HRESULT USBController::FinalConstruct()
+DEFINE_EMPTY_CTOR_DTOR(USBDeviceFilters)
+
+HRESULT USBDeviceFilters::FinalConstruct()
 {
     return BaseFinalConstruct();
 }
 
-void USBController::FinalRelease()
+void USBDeviceFilters::FinalRelease()
 {
     uninit();
@@ -109 +96 @@
  * @param aParent       Pointer to our parent object.
  */
-HRESULT USBController::init(Machine *aParent)
+HRESULT USBDeviceFilters::init(Machine *aParent)
 {
     LogFlowThisFunc(("aParent=%p\n", aParent));
@@ -122 +109 @@
 
     /* mPeer is left null */
-
-    m->bd.allocate();
 #ifdef VBOX_WITH_USB
     m->llDeviceFilters.allocate();
@@ -135 +120 @@
 
 /**
- * Initializes the USB controller object given another USB controller object
+ * Initializes the USB devic filters object given another USB filters object
  * (a kind of copy constructor). This object shares data with
  * the object passed as an argument.
@@ -146 +131 @@
  * it shares data with is destroyed.
  */
-HRESULT USBController::init(Machine *aParent, USBController *aPeer)
+HRESULT USBDeviceFilters::init(Machine *aParent, USBDeviceFilters *aPeer)
 {
     LogFlowThisFunc(("aParent=%p, aPeer=%p\n", aParent, aPeer));
@@ -161 +146 @@
 
     AutoWriteLock thatlock(aPeer COMMA_LOCKVAL_SRC_POS);
-    m->bd.share(aPeer->m->bd);
 
 #ifdef VBOX_WITH_USB
@@ -169 +153 @@
     while (it != aPeer->m->llDeviceFilters->end())
     {
-        ComObjPtr<USBDeviceFilter> filter;
-        filter.createObject();
-        filter->init(this, *it);
-        m->llDeviceFilters->push_back(filter);
+        ComObjPtr<USBDeviceFilter> pFilter;
+        pFilter.createObject();
+        pFilter->init(this, *it);
+        m->llDeviceFilters->push_back(pFilter);
         ++it;
     }
@@ -189 +173 @@
  *  of the original object passed as an argument.
  */
-HRESULT USBController::initCopy(Machine *aParent, USBController *aPeer)
+HRESULT USBDeviceFilters::initCopy(Machine *aParent, USBDeviceFilters *aPeer)
 {
     LogFlowThisFunc(("aParent=%p, aPeer=%p\n", aParent, aPeer));
@@ -204 +188 @@
 
     AutoWriteLock thatlock(aPeer COMMA_LOCKVAL_SRC_POS);
-    m->bd.attachCopy(aPeer->m->bd);
 
 #ifdef VBOX_WITH_USB
@@ -212 +195 @@
     while (it != aPeer->m->llDeviceFilters->end())
     {
-        ComObjPtr<USBDeviceFilter> filter;
-        filter.createObject();
-        filter->initCopy(this, *it);
-        m->llDeviceFilters->push_back(filter);
+        ComObjPtr<USBDeviceFilter> pFilter;
+        pFilter.createObject();
+        pFilter->initCopy(this, *it);
+        m->llDeviceFilters->push_back(pFilter);
         ++it;
     }
@@ -231 +214 @@
  * Called either from FinalRelease() or by the parent when it gets destroyed.
  */
-void USBController::uninit()
+void USBDeviceFilters::uninit()
 {
     LogFlowThisFunc(("\n"));
@@ -250 +233 @@
     m->llDeviceFilters.free();
 #endif
-    m->bd.free();
 
     unconst(m->pPeer) = NULL;
@@ -260 +242 @@
 
 
-// IUSBController properties
+// IUSBDeviceFilters properties
 /////////////////////////////////////////////////////////////////////////////
-
-STDMETHODIMP USBController::COMGETTER(Enabled)(BOOL *aEnabled)
-{
-    CheckComArgOutPointerValid(aEnabled);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    *aEnabled = m->bd->fEnabled;
-
-    return S_OK;
-}
-
-
-STDMETHODIMP USBController::COMSETTER(Enabled)(BOOL aEnabled)
-{
-    LogFlowThisFunc(("aEnabled=%RTbool\n", aEnabled));
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    /* the machine needs to be mutable */
-    AutoMutableStateDependency adep(m->pParent);
-    if (FAILED(adep.rc())) return adep.rc();
-
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    if (m->bd->fEnabled != aEnabled)
-    {
-        m->bd.backup();
-        m->bd->fEnabled = aEnabled;
-
-        // leave the lock for safety
-        alock.release();
-
-        AutoWriteLock mlock(m->pParent COMMA_LOCKVAL_SRC_POS);
-        m->pParent->setModified(Machine::IsModified_USB);
-        mlock.release();
-
-        m->pParent->onUSBControllerChange();
-    }
-
-    return S_OK;
-}
-
-STDMETHODIMP USBController::COMGETTER(EnabledEHCI)(BOOL *aEnabled)
-{
-    CheckComArgOutPointerValid(aEnabled);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    *aEnabled = m->bd->fEnabledEHCI;
-
-    return S_OK;
-}
-
-STDMETHODIMP USBController::COMSETTER(EnabledEHCI)(BOOL aEnabled)
-{
-    LogFlowThisFunc(("aEnabled=%RTbool\n", aEnabled));
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    /* the machine needs to be mutable */
-    AutoMutableStateDependency adep(m->pParent);
-    if (FAILED(adep.rc())) return adep.rc();
-
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    if (m->bd->fEnabledEHCI != aEnabled)
-    {
-        m->bd.backup();
-        m->bd->fEnabledEHCI = aEnabled;
-
-        // leave the lock for safety
-        alock.release();
-
-        AutoWriteLock mlock(m->pParent COMMA_LOCKVAL_SRC_POS);
-        m->pParent->setModified(Machine::IsModified_USB);
-        mlock.release();
-
-        m->pParent->onUSBControllerChange();
-    }
-
-    return S_OK;
-}
-
-STDMETHODIMP USBController::COMGETTER(ProxyAvailable)(BOOL *aEnabled)
-{
-    CheckComArgOutPointerValid(aEnabled);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-#ifdef VBOX_WITH_USB
-    *aEnabled = true;
-#else
-    *aEnabled = false;
-#endif
-
-    return S_OK;
-}
-
-STDMETHODIMP USBController::COMGETTER(USBStandard)(USHORT *aUSBStandard)
-{
-    CheckComArgOutPointerValid(aUSBStandard);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    /* not accessing data -- no need to lock */
-
-    /** @todo This is no longer correct */
-    *aUSBStandard = 0x0101;
-
-    return S_OK;
-}
 
 #ifndef VBOX_WITH_USB
@@ -432 +290 @@
 
 
-STDMETHODIMP USBController::COMGETTER(DeviceFilters)(ComSafeArrayOut(IUSBDeviceFilter *, aDevicesFilters))
+STDMETHODIMP USBDeviceFilters::COMGETTER(DeviceFilters)(ComSafeArrayOut(IUSBDeviceFilter *, aDevicesFilters))
 {
 #ifdef VBOX_WITH_USB
@@ -455 +313 @@
 }
 
-// IUSBController methods
+// IUSBDeviceFilters methods
 /////////////////////////////////////////////////////////////////////////////
 
-STDMETHODIMP USBController::CreateDeviceFilter(IN_BSTR aName,
-                                               IUSBDeviceFilter **aFilter)
+STDMETHODIMP USBDeviceFilters::CreateDeviceFilter(IN_BSTR aName,
+                                                  IUSBDeviceFilter **aFilter)
 {
 #ifdef VBOX_WITH_USB
@@ -475 +333 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    ComObjPtr<USBDeviceFilter> filter;
-    filter.createObject();
-    HRESULT rc = filter->init(this, aName);
+    ComObjPtr<USBDeviceFilter> pFilter;
+    pFilter.createObject();
+    HRESULT rc = pFilter->init(this, aName);
     ComAssertComRCRetRC(rc);
-    rc = filter.queryInterfaceTo(aFilter);
+    rc = pFilter.queryInterfaceTo(aFilter);
     AssertComRCReturnRC(rc);
 
@@ -490 +348 @@
 }
 
-STDMETHODIMP USBController::InsertDeviceFilter(ULONG aPosition,
-                                               IUSBDeviceFilter *aFilter)
+STDMETHODIMP USBDeviceFilters::InsertDeviceFilter(ULONG aPosition,
+                                                  IUSBDeviceFilter *aFilter)
 {
 #ifdef VBOX_WITH_USB
@@ -506 +364 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    ComObjPtr<USBDeviceFilter> filter = static_cast<USBDeviceFilter*>(aFilter);
-    // @todo r=dj make sure the input object is actually from us
-//     if (!filter)
-//         return setError(E_INVALIDARG,
-//             tr("The given USB device filter is not created within "
-//                 "this VirtualBox instance"));
-
-    if (filter->mInList)
+    ComObjPtr<USBDeviceFilter> pFilter = static_cast<USBDeviceFilter*>(aFilter);
+
+    if (pFilter->mInList)
         return setError(VBOX_E_INVALID_OBJECT_STATE,
-                        tr("The given USB device filter is already in the list"));
+                        tr("The given USB device pFilter is already in the list"));
 
     /* backup the list before modification */
@@ -530 +383 @@
         it = m->llDeviceFilters->end();
     /* ...and insert */
-    m->llDeviceFilters->insert(it, filter);
-    filter->mInList = true;
+    m->llDeviceFilters->insert(it, pFilter);
+    pFilter->mInList = true;
 
     /* notify the proxy (only when it makes sense) */
-    if (filter->getData().mActive && Global::IsOnline(adep.machineState())
-        && filter->getData().mRemote.isMatch(false))
-    {
-        USBProxyService *service = m->pHost->usbProxyService();
-        ComAssertRet(service, E_FAIL);
-
-        ComAssertRet(filter->getId() == NULL, E_FAIL);
-        filter->getId() = service->insertFilter(&filter->getData().mUSBFilter);
+    if (pFilter->getData().mActive && Global::IsOnline(adep.machineState())
+        && pFilter->getData().mRemote.isMatch(false))
+    {
+        USBProxyService *pProxySvc = m->pHost->usbProxyService();
+        ComAssertRet(pProxySvc, E_FAIL);
+
+        ComAssertRet(pFilter->getId() == NULL, E_FAIL);
+        pFilter->getId() = pProxySvc->insertFilter(&pFilter->getData().mUSBFilter);
     }
 
@@ -560 +413 @@
 }
 
-STDMETHODIMP USBController::RemoveDeviceFilter(ULONG aPosition,
-                                               IUSBDeviceFilter **aFilter)
+STDMETHODIMP USBDeviceFilters::RemoveDeviceFilter(ULONG aPosition,
+                                                  IUSBDeviceFilter **aFilter)
 {
 #ifdef VBOX_WITH_USB
@@ -578 +431 @@
     if (!m->llDeviceFilters->size())
         return setError(E_INVALIDARG,
-                        tr("The USB device filter list is empty"));
+                        tr("The USB device pFilter list is empty"));
 
     if (aPosition >= m->llDeviceFilters->size())
@@ -588 +441 @@
     m->llDeviceFilters.backup();
 
-    ComObjPtr<USBDeviceFilter> filter;
+    ComObjPtr<USBDeviceFilter> pFilter;
     {
         /* iterate to the position... */
@@ -594 +447 @@
         std::advance(it, aPosition);
         /* ...get an element from there... */
-        filter = *it;
+        pFilter = *it;
         /* ...and remove */
-        filter->mInList = false;
+        pFilter->mInList = false;
         m->llDeviceFilters->erase(it);
     }
 
     /* cancel sharing (make an independent copy of data) */
-    filter->unshare();
-
-    filter.queryInterfaceTo(aFilter);
+    pFilter->unshare();
+
+    pFilter.queryInterfaceTo(aFilter);
 
     /* notify the proxy (only when it makes sense) */
-    if (filter->getData().mActive && Global::IsOnline(adep.machineState())
-        && filter->getData().mRemote.isMatch(false))
-    {
-        USBProxyService *service = m->pHost->usbProxyService();
-        ComAssertRet(service, E_FAIL);
-
-        ComAssertRet(filter->getId() != NULL, E_FAIL);
-        service->removeFilter(filter->getId());
-        filter->getId() = NULL;
+    if (pFilter->getData().mActive && Global::IsOnline(adep.machineState())
+        && pFilter->getData().mRemote.isMatch(false))
+    {
+        USBProxyService *pProxySvc = m->pHost->usbProxyService();
+        ComAssertRet(pProxySvc, E_FAIL);
+
+        ComAssertRet(pFilter->getId() != NULL, E_FAIL);
+        pProxySvc->removeFilter(pFilter->getId());
+        pFilter->getId() = NULL;
     }
 
@@ -644 +497 @@
  *  @note Does not lock "this" as Machine::loadHardware, which calls this, does not lock either.
  */
-HRESULT USBController::loadSettings(const settings::USBController &data)
+HRESULT USBDeviceFilters::loadSettings(const settings::USBController &data)
 {
     AutoCaller autoCaller(this);
@@ -652 +505 @@
      * nodes are assigned in the Data::Data() constructor and don't do it
      * here. It implies that this method may only be called after constructing
-     * a new BIOSSettings object while all its data fields are in the default
+     * a new USBDeviceFilters object while all its data fields are in the default
      * values. Exceptions are fields whose creation time defaults don't match
      * values that should be applied when these fields are not explicitly set
@@ -660 +513 @@
      * default to B. */
 
-    m->bd->fEnabled = data.fEnabled;
-    m->bd->fEnabledEHCI = data.fEnabledEHCI;
-
 #ifdef VBOX_WITH_USB
     for (settings::USBDeviceFiltersList::const_iterator it = data.llDeviceFilters.begin();
@@ -690 +540 @@
  *  @note Locks this object for reading.
  */
-HRESULT USBController::saveSettings(settings::USBController &data)
+HRESULT USBDeviceFilters::saveSettings(settings::USBController &data)
 {
     AutoCaller autoCaller(this);
@@ -696 +546 @@
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    data.fEnabled = !!m->bd->fEnabled;
-    data.fEnabledEHCI = !!m->bd->fEnabledEHCI;
 
 #ifdef VBOX_WITH_USB
@@ -740 +587 @@
 
 /** @note Locks objects for writing! */
-void USBController::rollback()
+void USBDeviceFilters::rollback()
 {
     AutoCaller autoCaller(this);
@@ -751 +598 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    m->bd.rollback();
-
 #ifdef VBOX_WITH_USB
 
     if (m->llDeviceFilters.isBackedUp())
     {
-        USBProxyService *service = m->pHost->usbProxyService();
-        Assert(service);
+        USBProxyService *pProxySvc = m->pHost->usbProxyService();
+        Assert(pProxySvc);
 
         /* uninitialize all new filters (absent in the backed up list) */
@@ -773 +618 @@
                     && (*it)->getData().mRemote.isMatch(false))
                 {
-                    USBDeviceFilter *filter = *it;
-                    Assert(filter->getId() != NULL);
-                    service->removeFilter(filter->getId());
-                    filter->getId() = NULL;
+                    USBDeviceFilter *pFilter = *it;
+                    Assert(pFilter->getId() != NULL);
+                    pProxySvc->removeFilter(pFilter->getId());
+                    pFilter->getId() = NULL;
                 }
 
@@ -798 +643 @@
                             && (*it)->getData().mRemote.isMatch(false))
                     {
-                        USBDeviceFilter *flt = *it; /* resolve ambiguity */
-                        Assert(flt->getId() == NULL);
-                        flt->getId() = service->insertFilter(&flt->getData().mUSBFilter);
+                        USBDeviceFilter *pFilter = *it; /* resolve ambiguity */
+                        Assert(pFilter->getId() == NULL);
+                        pFilter->getId() = pProxySvc->insertFilter(&pFilter->getData().mUSBFilter);
                     }
                 }
@@ -834 +679 @@
  *  for writing) if there is one.
  */
-void USBController::commit()
+void USBDeviceFilters::commit()
 {
     /* sanity */
@@ -847 +692 @@
      * first) */
     AutoMultiWriteLock2 alock(m->pPeer, this COMMA_LOCKVAL_SRC_POS);
-
-    if (m->bd.isBackedUp())
-    {
-        m->bd.commit();
-        if (m->pPeer)
-        {
-            /* attach new data to the peer and reshare it */
-            AutoWriteLock peerlock(m->pPeer COMMA_LOCKVAL_SRC_POS);
-            m->pPeer->m->bd.attach(m->bd);
-        }
-    }
 
 #ifdef VBOX_WITH_USB
@@ -940 +774 @@
  *  represented by @a aThat (locked for reading).
  */
-void USBController::copyFrom(USBController *aThat)
+void USBDeviceFilters::copyFrom(USBDeviceFilters *aThat)
 {
     AssertReturnVoid(aThat != NULL);
@@ -962 +796 @@
     AutoReadLock rl(aThat COMMA_LOCKVAL_SRC_POS);
     AutoWriteLock wl(this COMMA_LOCKVAL_SRC_POS);
-
-    /* this will back up current data */
-    m->bd.assignCopy(aThat->m->bd);
 
 #ifdef VBOX_WITH_USB
@@ -978 +809 @@
         ++it)
     {
-        ComObjPtr<USBDeviceFilter> filter;
-        filter.createObject();
-        filter->initCopy(this, *it);
-        m->llDeviceFilters->push_back(filter);
+        ComObjPtr<USBDeviceFilter> pFilter;
+        pFilter.createObject();
+        pFilter->initCopy(this, *it);
+        m->llDeviceFilters->push_back(pFilter);
     }
 
@@ -994 +825 @@
  *  @note Locks nothing.
  */
-HRESULT USBController::onDeviceFilterChange(USBDeviceFilter *aFilter,
-                                            BOOL aActiveChanged /* = FALSE */)
+HRESULT USBDeviceFilters::onDeviceFilterChange(USBDeviceFilter *aFilter,
+                                               BOOL aActiveChanged /* = FALSE */)
 {
     AutoCaller autoCaller(this);
@@ -1013 +844 @@
          && m->pParent->isRegistered())
     {
-        USBProxyService *service = m->pHost->usbProxyService();
-        ComAssertRet(service, E_FAIL);
+        USBProxyService *pProxySvc = m->pHost->usbProxyService();
+        ComAssertRet(pProxySvc, E_FAIL);
 
         if (aActiveChanged)
@@ -1024 +855 @@
                 {
                     ComAssertRet(aFilter->getId() == NULL, E_FAIL);
-                    aFilter->getId() = service->insertFilter(&aFilter->getData().mUSBFilter);
+                    aFilter->getId() = pProxySvc->insertFilter(&aFilter->getData().mUSBFilter);
                 }
                 else
                 {
                     ComAssertRet(aFilter->getId() != NULL, E_FAIL);
-                    service->removeFilter(aFilter->getId());
+                    pProxySvc->removeFilter(aFilter->getId());
                     aFilter->getId() = NULL;
                 }
@@ -1040 +871 @@
                 /* update the filter in the proxy */
                 ComAssertRet(aFilter->getId() != NULL, E_FAIL);
-                service->removeFilter(aFilter->getId());
+                pProxySvc->removeFilter(aFilter->getId());
                 if (aFilter->getData().mRemote.isMatch(false))
                 {
-                    aFilter->getId() = service->insertFilter(&aFilter->getData().mUSBFilter);
+                    aFilter->getId() = pProxySvc->insertFilter(&aFilter->getData().mUSBFilter);
                 }
             }
@@ -1060 +891 @@
  *  @note Locks this object for reading.
  */
-bool USBController::hasMatchingFilter(const ComObjPtr<HostUSBDevice> &aDevice, ULONG *aMaskedIfs)
+bool USBDeviceFilters::hasMatchingFilter(const ComObjPtr<HostUSBDevice> &aDevice, ULONG *aMaskedIfs)
 {
     AutoCaller autoCaller(this);
@@ -1067 +898 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    /* Disabled USB controllers cannot actually work with USB devices */
-    if (!m->bd->fEnabled)
+    /* It is not possible to work with USB device if there is no USB controller present. */
+    if (!m->pParent->isUSBControllerPresent())
         return false;
 
@@ -1099 +930 @@
  *  @note Locks this object for reading.
  */
-bool USBController::hasMatchingFilter(IUSBDevice *aUSBDevice, ULONG *aMaskedIfs)
+bool USBDeviceFilters::hasMatchingFilter(IUSBDevice *aUSBDevice, ULONG *aMaskedIfs)
 {
     LogFlowThisFuncEnter();
@@ -1108 +939 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    /* Disabled USB controllers cannot actually work with USB devices */
-    if (!m->bd->fEnabled)
+    /* It is not possible to work with USB device if there is no USB controller present. */
+    if (!m->pParent->isUSBControllerPresent())
         return false;
 
@@ -1195 +1026 @@
 
 /**
- *  Notifies the proxy service about all filters as requested by the
+ *  Notifies the proxy pProxySvc about all filters as requested by the
  *  @a aInsertFilters argument.
  *
@@ -1202 +1033 @@
  *  @note Locks this object for reading.
  */
-HRESULT USBController::notifyProxy(bool aInsertFilters)
+HRESULT USBDeviceFilters::notifyProxy(bool aInsertFilters)
 {
     LogFlowThisFunc(("aInsertFilters=%RTbool\n", aInsertFilters));
@@ -1211 +1042 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    USBProxyService *service = m->pHost->usbProxyService();
-    AssertReturn(service, E_FAIL);
+    USBProxyService *pProxySvc = m->pHost->usbProxyService();
+    AssertReturn(pProxySvc, E_FAIL);
 
     DeviceFilterList::const_iterator it = m->llDeviceFilters->begin();
     while (it != m->llDeviceFilters->end())
     {
-        USBDeviceFilter *flt = *it; /* resolve ambiguity (for ComPtr below) */
+        USBDeviceFilter *pFilter = *it; /* resolve ambiguity (for ComPtr below) */
 
         /* notify the proxy (only if the filter is active) */
-        if (   flt->getData().mActive
-            && flt->getData().mRemote.isMatch(false) /* and if the filter is NOT remote */
+        if (   pFilter->getData().mActive
+            && pFilter->getData().mRemote.isMatch(false) /* and if the filter is NOT remote */
            )
         {
             if (aInsertFilters)
             {
-                AssertReturn(flt->getId() == NULL, E_FAIL);
-                flt->getId() = service->insertFilter(&flt->getData().mUSBFilter);
+                AssertReturn(pFilter->getId() == NULL, E_FAIL);
+                pFilter->getId() = pProxySvc->insertFilter(&pFilter->getData().mUSBFilter);
             }
             else
@@ -1234 +1065 @@
                  * when this method gets called (as a result of an early VM
                  * process crash for example. So, don't assert that ID != NULL. */
-                if (flt->getId() != NULL)
+                if (pFilter->getId() != NULL)
                 {
-                    service->removeFilter(flt->getId());
-                    flt->getId() = NULL;
+                    pProxySvc->removeFilter(pFilter->getId());
+                    pFilter->getId() = NULL;
                 }
             }
@@ -1247 +1078 @@
 }
 
-Machine* USBController::getMachine()
+Machine* USBDeviceFilters::getMachine()
 {
     return m->pParent;

trunk/src/VBox/Main/src-server/xpcom/server.cpp

@@ -85 +85 @@
 #include "SystemPropertiesImpl.h"
 #include "USBControllerImpl.h"
+#include "USBDeviceFiltersImpl.h"
 #include "VFSExplorerImpl.h"
 #include "VirtualBoxImpl.h"
@@ -173 +174 @@
 NS_DECL_CLASSINFO(USBController)
 NS_IMPL_THREADSAFE_ISUPPORTS1_CI(USBController, IUSBController)
+
+NS_DECL_CLASSINFO(USBDeviceFilters)
+NS_IMPL_THREADSAFE_ISUPPORTS1_CI(USBDeviceFilters, IUSBDeviceFilters)
 
 NS_DECL_CLASSINFO(StorageController)