Changeset 5713 in vbox

Timestamp:

Nov 12, 2007 5:06:56 PM (17 years ago)

Author:

vboxsync

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

26069

Message:

Added an maskedInterface property to the USB filters. It is used to hide a set of interface from the guest, which means that on Linux we won't capture those and linux can continue using them.

Location:

trunk

Files:

• include/VBox/pdmusb.h (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/VBoxManage.cpp (modified) (10 diffs)
• src/VBox/Main/ConsoleImpl.cpp (modified) (7 diffs)
• src/VBox/Main/HostImpl.cpp (modified) (1 diff)
• src/VBox/Main/HostUSBDeviceImpl.cpp (modified) (5 diffs)
• src/VBox/Main/MachineImpl.cpp (modified) (8 diffs)
• src/VBox/Main/SessionImpl.cpp (modified) (2 diffs)
• src/VBox/Main/USBControllerImpl.cpp (modified) (7 diffs)
• src/VBox/Main/USBDeviceFilterImpl.cpp (modified) (8 diffs)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (6 diffs)
• src/VBox/Main/include/ConsoleImpl.h (modified) (2 diffs)
• src/VBox/Main/include/HostUSBDeviceImpl.h (modified) (2 diffs)
• src/VBox/Main/include/MachineImpl.h (modified) (10 diffs)
• src/VBox/Main/include/SessionImpl.h (modified) (1 diff)
• src/VBox/Main/include/USBControllerImpl.h (modified) (1 diff)
• src/VBox/Main/include/USBDeviceFilterImpl.h (modified) (6 diffs)
• src/VBox/Main/xml/VirtualBox-settings-common.xsd (modified) (2 diffs)

trunk/include/VBox/pdmusb.h

@@ -581 +581 @@
  * @param   pvBackend       Pointer to the backend.
  * @param   iUsbVersion     The preferred USB version.
- */
-PDMR3DECL(int) PDMR3USBCreateProxyDevice(PVM pVM, PCRTUUID pUuid, bool fRemote, const char *pszAddress, void *pvBackend, uint32_t iUsbVersion);
+ * @param   fMaskedIfs      The interfaces to hide from the guest.
+ */
+PDMR3DECL(int) PDMR3USBCreateProxyDevice(PVM pVM, PCRTUUID pUuid, bool fRemote, const char *pszAddress, void *pvBackend,
+                                         uint32_t iUsbVersion, uint32_t fMaskedIfs);
 
 /**

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

@@ -189 +189 @@
         Bstr mRemote;
         Bstr mSerialNumber;
+        Nullable <ULONG> mMaskedInterfaces;
         USBDeviceFilterAction_T mAction;
     };
@@ -556 +557 @@
                  "                            [-remote yes|no] (null, VM filters only)\n"
                  "                            [-serialnumber <string>] (null)\n"
+                 "                            [-maskedinterfaces <XXXXXXXX>]\n"
                  "\n");
     }
@@ -573 +575 @@
                  "                            [-remote yes|no] (null, VM filters only)\n"
                  "                            [-serialnumber <string>|\"\"]\n"
+                 "                            [-maskedinterfaces <XXXXXXXX>]\n"
                  "\n");
     }
@@ -1631 +1634 @@
                 RTPrintf("USBFilterRemote%d=\"%lS\"\n", index + 1, bstr.raw());
             else
-                RTPrintf("Remote:           %lS\n\n", bstr.raw());
+                RTPrintf("Remote:           %lS\n", bstr.raw());
             CHECK_ERROR_RET (DevPtr, COMGETTER (SerialNumber) (bstr.asOutParam()), rc);
             if (details == VMINFO_MACHINEREADABLE)
                 RTPrintf("USBFilterSerialNumber%d=\"%lS\"\n", index + 1, bstr.raw());
             else
-                RTPrintf("Serial Number:    %lS\n\n", bstr.raw());
+                RTPrintf("Serial Number:    %lS\n", bstr.raw());
+            if (details != VMINFO_MACHINEREADABLE)
+            {
+                ULONG fMaskedIfs;
+                CHECK_ERROR_RET (DevPtr, COMGETTER (MaskedInterfaces) (&fMaskedIfs), rc);
+                if (fMaskedIfs)
+                    RTPrintf("Masked Interfaces: 0x%08x\n", fMaskedIfs);
+                RTPrintf("\n");
+            }
 
             rc = Enum->HasMore (&fMore);
@@ -6576 +6587 @@
                     return errorSyntax(USAGE_USBFILTER_ADD, "Not enough parameters");
                 }
-                else
-                {
-                    return errorSyntax(USAGE_USBFILTER_MODIFY, "Not enough parameters");
-                }
+                return errorSyntax(USAGE_USBFILTER_MODIFY, "Not enough parameters");
             }
 
@@ -6698 +6706 @@
                     cmd.mFilter.mSerialNumber = argv [i];
                 }
+                else if (strcmp(argv [i], "-maskedinterfaces") == 0)
+                {
+                    if (argc <= i + 1)
+                    {
+                        return errorArgument("Missing argument to '%s'", argv[i]);
+                    }
+                    i++;
+                    uint32_t u32;
+                    rc = RTStrToUInt32Full(argv[i], 0, &u32);
+                    if (RT_FAILURE(rc))
+                    {
+                        return errorArgument("Failed to convert the -maskinterfaces value '%s' to a number, rc=%Rrc", argv[i], rc);
+                    }
+                    cmd.mFilter.mMaskedInterfaces = u32;
+                }
                 else if (strcmp(argv [i], "-action") == 0)
                 {
@@ -6820 +6843 @@
                 if (!f.mSerialNumber.isNull())
                     CHECK_ERROR_BREAK (flt, COMSETTER(SerialNumber) (f.mSerialNumber.setNullIfEmpty()));
+                if (!f.mMaskedInterfaces.isNull())
+                    CHECK_ERROR_BREAK (flt, COMSETTER(MaskedInterfaces) (f.mMaskedInterfaces));
 
                 if (f.mAction != USBDeviceFilterAction_InvalidUSBDeviceFilterAction)
@@ -6845 +6870 @@
                 if (!f.mSerialNumber.isNull())
                     CHECK_ERROR_BREAK (flt, COMSETTER(SerialNumber) (f.mSerialNumber.setNullIfEmpty()));
+                if (!f.mMaskedInterfaces.isNull())
+                    CHECK_ERROR_BREAK (flt, COMSETTER(MaskedInterfaces) (f.mMaskedInterfaces));
 
                 CHECK_ERROR_BREAK (ctl, InsertDeviceFilter (cmd.mIndex, flt));
@@ -6873 +6900 @@
                 if (!f.mSerialNumber.isNull())
                     CHECK_ERROR_BREAK (flt, COMSETTER(SerialNumber) (f.mSerialNumber.setNullIfEmpty()));
+                if (!f.mMaskedInterfaces.isNull())
+                    CHECK_ERROR_BREAK (flt, COMSETTER(MaskedInterfaces) (f.mMaskedInterfaces));
 
                 if (f.mAction != USBDeviceFilterAction_InvalidUSBDeviceFilterAction)
@@ -6901 +6930 @@
                 if (!f.mSerialNumber.isNull())
                     CHECK_ERROR_BREAK (flt, COMSETTER(SerialNumber) (f.mSerialNumber.setNullIfEmpty()));
+                if (!f.mMaskedInterfaces.isNull())
+                    CHECK_ERROR_BREAK (flt, COMSETTER(MaskedInterfaces) (f.mMaskedInterfaces));
             }
             break;

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -3365 +3365 @@
  *  @param aDevice
  *      The device in question.
+ *  @param aMaskedIfs
+ *      The interfaces to hide from the guest.
  *
  *  @note Locks this object for writing.
  */
-HRESULT Console::onUSBDeviceAttach (IUSBDevice *aDevice, IVirtualBoxErrorInfo *aError)
+HRESULT Console::onUSBDeviceAttach (IUSBDevice *aDevice, IVirtualBoxErrorInfo *aError, ULONG aMaskedIfs)
 {
     LogFlowThisFunc (("aDevice=%p aError=%p\n", aDevice, aError));
@@ -3419 +3421 @@
     }
 
-    HRESULT rc = attachUSBDevice (aDevice);
+    HRESULT rc = attachUSBDevice (aDevice, aMaskedIfs);
 #endif /* PDMUsb */
 
@@ -4709 +4711 @@
     AssertReturn (aHostDevice && aConfig, E_FAIL);
 #else /* PDMUsb */
-HRESULT Console::attachUSBDevice (IUSBDevice *aHostDevice)
+HRESULT Console::attachUSBDevice (IUSBDevice *aHostDevice, ULONG aMaskedIfs)
 {
     AssertReturn (aHostDevice, E_FAIL);
@@ -4763 +4765 @@
     PVMREQ pReq = NULL;
     int vrc = VMR3ReqCall (mpVM, &pReq, RT_INDEFINITE_WAIT,
-                           (PFNRT) usbAttachCallback, 5, this, aHostDevice, Uuid.ptr(), fRemote, Address.raw());
+                           (PFNRT) usbAttachCallback, 6, this, aHostDevice, Uuid.ptr(), fRemote, Address.raw(), aMaskedIfs);
 #endif /* PDMUsb */
     if (VBOX_SUCCESS (vrc))
@@ -4863 +4865 @@
 //static
 DECLCALLBACK(int)
-Console::usbAttachCallback (Console *that, IUSBDevice *aHostDevice, PCRTUUID aUuid, bool aRemote, const char *aAddress)
+Console::usbAttachCallback (Console *that, IUSBDevice *aHostDevice, PCRTUUID aUuid, bool aRemote, const char *aAddress, ULONG aMaskedIfs)
 {
     LogFlowFuncEnter();
@@ -4887 +4889 @@
 
     int vrc = PDMR3USBCreateProxyDevice (that->mpVM, aUuid, aRemote, aAddress, pvRemoteBackend,
-                                         portVersion == 1 ? VUSB_STDVER_11 : VUSB_STDVER_20);
+                                         portVersion == 1 ? VUSB_STDVER_11 : VUSB_STDVER_20, aMaskedIfs);
     if (VBOX_SUCCESS (vrc))
     {
@@ -5722 +5724 @@
             /* Check if the device is ok for current USB filters. */
             BOOL fMatched = FALSE;
-
-            HRESULT hrc = mControl->RunUSBDeviceFilters(device, &fMatched);
+            ULONG fMaskedIfs = 0;
+
+            HRESULT hrc = mControl->RunUSBDeviceFilters(device, &fMatched, &fMaskedIfs);
 
             AssertComRC (hrc);
 
-            LogFlowThisFunc (("USB filters return %d\n", fMatched));
+            LogFlowThisFunc (("USB filters return %d %#x\n", fMatched, fMaskedIfs));
 
             if (fMatched)
             {
-                hrc = onUSBDeviceAttach (device, NULL);
+                hrc = onUSBDeviceAttach (device, NULL, fMaskedIfs);
 
                 /// @todo (r=dmik) warning reporting subsystem

trunk/src/VBox/Main/HostImpl.cpp

@@ -2193 +2193 @@
     AssertReturn (aDevice->isStatePending() == false, false);
 
-    bool hasMatch = aMachine->hasMatchingUSBFilter (aDevice);
+    ULONG maskedIfs;
+    bool hasMatch = aMachine->hasMatchingUSBFilter (aDevice, &maskedIfs);
 
     if (hasMatch)
     {
         /* try to capture the device */
-        return aDevice->requestCapture (aMachine);
+        return aDevice->requestCapture (aMachine, maskedIfs);
     }
 

trunk/src/VBox/Main/HostUSBDeviceImpl.cpp

@@ -379 +379 @@
  *  Captured), then the machine is informed before this method returns.
  *
- *  @param aMachine     Machine that will capture this device on success.
- *  @return             @c false if the device could be immediately captured
- *                      but the VM process refused to grab it;
- *                      @c true otherwise.
+ *  @param aMachine         Machine that will capture this device on success.
+ *  @param aMaskedIfs       The interfaces to hide from the guest.
+ *  @return                 @c false if the device could be immediately captured
+ *                          but the VM process refused to grab it;
+ *                          @c true otherwise.
  *
  *  @note Must be called from under the object write lock.
@@ -388 +389 @@
  *  @note May lock the given machine object for reading.
  */
-bool HostUSBDevice::requestCapture (SessionMachine *aMachine)
+bool HostUSBDevice::requestCapture (SessionMachine *aMachine, ULONG aMaskedIfs /* = 0*/)
 {
     LogFlowThisFunc (("\n"));
@@ -419 +420 @@
         LogFlowThisFunc (("Calling machine->onUSBDeviceAttach()...\n"));
 
-        HRESULT rc = aMachine->onUSBDeviceAttach (d, NULL);
+        HRESULT rc = aMachine->onUSBDeviceAttach (d, NULL, aMaskedIfs);
 
         /* The VM process has a legal reason to fail (for example, incorrect
@@ -449 +450 @@
     mPendingSince = RTTimeNanoTS();
     mMachine = aMachine;
+    mMaskedIfs = aMaskedIfs;
 
     mUSBProxyService->captureDevice (this);
@@ -738 +740 @@
         LogFlowThisFunc (("Calling machine->onUSBDeviceAttach()...\n"));
 
-        HRESULT rc = mMachine->onUSBDeviceAttach (d, error);
+        HRESULT rc = mMachine->onUSBDeviceAttach (d, error, mMaskedIfs);
 
         /* The VM process has a legal reason to fail (for example, incorrect

trunk/src/VBox/Main/MachineImpl.cpp

@@ -2537 +2537 @@
 }
 
-/** 
+/**
  *  Saves the registry entry of this machine to the given configuration node.
- * 
+ *
  *  @param aEntryNode Node to save the registry entry to.
  *
@@ -8514 +8514 @@
  */
 STDMETHODIMP SessionMachine::RunUSBDeviceFilters (IUSBDevice *aUSBDevice,
-                                                  BOOL *aMatched)
+                                                  BOOL *aMatched,
+                                                  ULONG *aMaskedIfs)
 {
     LogFlowThisFunc (("\n"));
@@ -8526 +8527 @@
     AssertComRCReturn (autoCaller.rc(), autoCaller.rc());
 
-    *aMatched = mUSBController->hasMatchingFilter (aUSBDevice);
+    *aMatched = mUSBController->hasMatchingFilter (aUSBDevice, aMaskedIfs);
 
     return S_OK;
@@ -9516 +9517 @@
 }
 
-/** 
+/**
  *  Returns @c true if this machine's USB controller reports it has a matching
  *  filter for the given USB device and @c false otherwise.
@@ -9522 +9523 @@
  *  @note Locks this object for reading.
  */
-bool SessionMachine::hasMatchingUSBFilter (const ComObjPtr <HostUSBDevice> &aDevice)
+bool SessionMachine::hasMatchingUSBFilter (const ComObjPtr <HostUSBDevice> &aDevice, ULONG *aMaskedIfs)
 {
     AutoCaller autoCaller (this);
@@ -9532 +9533 @@
     AutoReaderLock alock (this);
 
-    return mUSBController->hasMatchingFilter (aDevice);
+    return mUSBController->hasMatchingFilter (aDevice, aMaskedIfs);
 }
 
@@ -9539 +9540 @@
  */
 HRESULT SessionMachine::onUSBDeviceAttach (IUSBDevice *aDevice,
-                                           IVirtualBoxErrorInfo *aError)
+                                           IVirtualBoxErrorInfo *aError,
+                                           ULONG aMaskedIfs)
 {
     LogFlowThisFunc (("\n"));
@@ -9560 +9562 @@
         return E_FAIL;
 
-    return directControl->OnUSBDeviceAttach (aDevice, aError);
+    return directControl->OnUSBDeviceAttach (aDevice, aError, aMaskedIfs);
 }
 

trunk/src/VBox/Main/SessionImpl.cpp

@@ -606 +606 @@
 
 STDMETHODIMP Session::OnUSBDeviceAttach (IUSBDevice *aDevice,
-                                         IVirtualBoxErrorInfo *aError)
-{
-    LogFlowThisFunc (("\n"));
-
-    AutoCaller autoCaller (this);
-    AssertComRCReturn (autoCaller.rc(), autoCaller.rc());
-
-    AutoReaderLock alock (this);
-    AssertReturn (mState == SessionState_SessionOpen &&
-                  mType == SessionType_DirectSession, E_FAIL);
-
-    return mConsole->onUSBDeviceAttach (aDevice, aError);
+                                         IVirtualBoxErrorInfo *aError,
+                                         ULONG aMaskedIfs)
+{
+    LogFlowThisFunc (("\n"));
+
+    AutoCaller autoCaller (this);
+    AssertComRCReturn (autoCaller.rc(), autoCaller.rc());
+
+    AutoReaderLock alock (this);
+    AssertReturn (mState == SessionState_SessionOpen &&
+                  mType == SessionType_DirectSession, E_FAIL);
+
+    return mConsole->onUSBDeviceAttach (aDevice, aError, aMaskedIfs);
 }
 
@@ -994 +995 @@
 #endif
 
-#if defined(RT_OS_OS2) 
+#if defined(RT_OS_OS2)
 /** VM IPC mutex holder thread */
 DECLCALLBACK(int) IPCMutexHolderThread (RTTHREAD Thread, void *pvUser)

trunk/src/VBox/Main/USBControllerImpl.cpp

@@ -539 +539 @@
         Bstr remote;
         CFGLDRQueryBSTR (filter, "remote", remote.asOutParam());
+        uint32_t maskedIfs;
+        if (RT_FAILURE(CFGLDRQueryUInt32 (filter, "maskedInterfaces", &maskedIfs)))
+            maskedIfs = 0;
 
         ComObjPtr <USBDeviceFilter> filterObj;
@@ -545 +548 @@
                               name, active, vendorId, productId, revision,
                               manufacturer, product, serialNumber,
-                              port, remote);
+                              port, remote, maskedIfs);
         /* error info is set by init() when appropriate */
         if (SUCCEEDED (rc))
@@ -657 +660 @@
             CFGLDRSetBSTR (filter, "remote", data.mRemote.string());
 #endif /* VBOX_WITH_USBFILTER */
+
+        if (data.mMaskedIfs)
+            CFGLDRSetUInt32 (filter, "maskedInterfaces", data.mMaskedIfs);
 
         CFGLDRReleaseNode (filter);
@@ -1102 +1108 @@
  *  @note Locks this object for reading.
  */
-bool USBController::hasMatchingFilter (ComObjPtr <HostUSBDevice> &aDevice)
+bool USBController::hasMatchingFilter (const ComObjPtr <HostUSBDevice> &aDevice, ULONG *aMaskedIfs)
 {
     AutoCaller autoCaller (this);
@@ -1113 +1119 @@
         return false;
 
-    bool match = false;
-
     /* apply self filters */
     for (DeviceFilterList::const_iterator it = mDeviceFilters->begin();
-         !match && it != mDeviceFilters->end();
+         it != mDeviceFilters->end();
          ++ it)
     {
         AutoLock filterLock (*it);
-        match = aDevice->isMatch ((*it)->data());
-    }
-
-    return match;
+        if (aDevice->isMatch ((*it)->data()))
+        {
+            *aMaskedIfs = (*it)->data().mMaskedIfs;
+            return true;
+        }
+    }
+
+    return false;
 }
 
@@ -1139 +1147 @@
  *  @note Locks this object for reading.
  */
-bool USBController::hasMatchingFilter (IUSBDevice *aUSBDevice)
+bool USBController::hasMatchingFilter (IUSBDevice *aUSBDevice, ULONG *aMaskedIfs)
 {
     LogFlowThisFuncEnter();
@@ -1265 +1273 @@
 
         match = true;
+        *aMaskedIfs = aData.mMaskedIfs;
         break;
     }

trunk/src/VBox/Main/USBDeviceFilterImpl.cpp

@@ -174 +174 @@
                                INPTR BSTR aManufacturer, INPTR BSTR aProduct,
                                INPTR BSTR aSerialNumber,
-                               INPTR BSTR aPort, INPTR BSTR aRemote)
+                               INPTR BSTR aPort, INPTR BSTR aRemote,
+                               ULONG aMaskedIfs)
 {
     LogFlowThisFunc (("aParent=%p\n", aParent));
@@ -194 +195 @@
     mData->mName = aName;
     mData->mActive = aActive;
+    mData->mMaskedIfs = 0;
 
     /* initialize all filters to any match using null string */
@@ -233 +235 @@
         rc = COMSETTER(Remote) (aRemote);
         CheckComRCBreakRC (rc);
+        rc = COMSETTER(MaskedInterfaces) (aMaskedIfs);
+        CheckComRCBreakRC (rc);
     }
     while (0);
@@ -269 +273 @@
     mData->mName = aName;
     mData->mActive = FALSE;
+    mData->mMaskedIfs = 0;
 
     /* initialize all filters to any match using null string */
@@ -959 +964 @@
         mData.backup();
         mData->mRemote = flt;
+
+        /* leave the lock before informing callbacks */
+        alock.unlock();
+
+        return mParent->onDeviceFilterChange (this);
+    }
+
+    return S_OK;
+}
+
+STDMETHODIMP USBDeviceFilter::COMGETTER(MaskedInterfaces) (ULONG *aMaskedIfs)
+{
+    if (!aMaskedIfs)
+        return E_POINTER;
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    AutoReaderLock alock (this);
+
+    *aMaskedIfs = mData->mMaskedIfs;
+
+    return S_OK;
+}
+
+STDMETHODIMP USBDeviceFilter::COMSETTER(MaskedInterfaces) (ULONG aMaskedIfs)
+{
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    /* the machine needs to be mutable */
+    Machine::AutoMutableStateDependency adep (mParent->parent());
+    CheckComRCReturnRC (adep.rc());
+
+    AutoLock alock (this);
+
+    if (mData->mMaskedIfs != aMaskedIfs)
+    {
+        mData.backup();
+        mData->mMaskedIfs = aMaskedIfs;
 
         /* leave the lock before informing callbacks */
@@ -1192 +1237 @@
 #endif /* VBOX_WITH_USBFILTER */
     mData->mRemote = NULL;
+    mData->mMaskedIfs = 0;
 
     mInList = false;
@@ -1273 +1319 @@
 #endif /* VBOX_WITH_USBFILTER */
     mData->mRemote = NULL;
+    mData->mMaskedIfs = 0;
 
     /* Confirm successful initialization */
@@ -1776 +1823 @@
         tr ("The remote state filter is not supported by "
             "IHostUSBDeviceFilter objects"));
+}
+
+STDMETHODIMP HostUSBDeviceFilter::COMGETTER(MaskedInterfaces) (ULONG *aMaskedIfs)
+{
+    if (!aMaskedIfs)
+        return E_POINTER;
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    AutoReaderLock alock (this);
+
+    *aMaskedIfs = mData->mMaskedIfs;
+
+    return S_OK;
+}
+
+STDMETHODIMP HostUSBDeviceFilter::COMSETTER(MaskedInterfaces) (INPTR ULONG aMaskedIfs)
+{
+    return setError (E_NOTIMPL,
+        tr ("The masked interfaces property is not applicable to IHostUSBDeviceFilter objects"));
 }
 

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

@@ -1902 +1902 @@
   <interface
      name="IInternalMachineControl" extends="$unknown"
-     uuid="f33740bf-53b2-4519-b950-104260c6a189"
+     uuid="1063893c-4c38-4304-aee9-73e072c181cc"
      internal="yes"
      wsmap="suppress"
@@ -1934 +1934 @@
       </desc>
       <param name="device" type="IUSBDevice" dir="in"/>
-      <param name="matched" type="boolean" dir="return"/>
+      <param name="matched" type="boolean" dir="out"/>
+      <param name="maskedInterfaces" type="unsigned long" dir="out"/>
     </method>
 
@@ -7981 +7982 @@
   <enumerator
      name="IUSBDeviceFilterEnumerator" type="IUSBDeviceFilter"
-     uuid="8d066d8b-3576-4a22-a387-847840937453"
+     uuid="d5109c61-93e7-4726-926b-0dee1020da56"
      />
 
@@ -8140 +8141 @@
           i.e. it is ignored by IHostUSBDeviceFilter objects.
         </note>
+      </desc>
+    </attribute>
+
+    <attribute name="maskedInterfaces" type="unsigned long">
+      <desc>
+       This is an advanced option for hiding one or more USB interfaces
+       from the guest. The value is a bitmask where the bits that are set
+       means the corresponding USB interface should be hidden, masked off
+       if you like.
+       This feature only works on Linux hosts.
       </desc>
     </attribute>
@@ -8583 +8594 @@
   <interface
      name="IInternalSessionControl" extends="$unknown"
-     uuid="e25a28b0-a58a-4582-b7c8-40abaa1f5d5b"
+     uuid="37838967-2430-4bb1-8acc-1b5b2c383d44"
      internal="yes"
      wsmap="suppress"
@@ -8709 +8720 @@
       <param name="device" type="IUSBDevice" dir="in"/>
       <param name="error" type="IVirtualBoxErrorInfo" dir="in"/>
+      <param name="maskedInterfaces" type="unsigned long" dir="in"/>
     </method>
 

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

@@ -174 +174 @@
     HRESULT onUSBControllerChange();
     HRESULT onSharedFolderChange (BOOL aGlobal);
-    HRESULT onUSBDeviceAttach (IUSBDevice *aDevice, IVirtualBoxErrorInfo *aError);
+    HRESULT onUSBDeviceAttach (IUSBDevice *aDevice, IVirtualBoxErrorInfo *aError, ULONG aMaskedIfs);
     HRESULT onUSBDeviceDetach (INPTR GUIDPARAM aId, IVirtualBoxErrorInfo *aError);
 
@@ -416 +416 @@
                        PVUSBIRHCONFIG aConfig, PCRTUUID aUuid);
 #else /* PDMUsb coding. */
-    HRESULT attachUSBDevice (IUSBDevice *aHostDevice);
+    HRESULT attachUSBDevice (IUSBDevice *aHostDevice, ULONG aMaskedIfs);
     HRESULT detachUSBDevice (USBDeviceList::iterator &aIt);
 
     static DECLCALLBACK(int)
     usbAttachCallback (Console *that, IUSBDevice *aHostDevice, PCRTUUID aUuid,
-                       bool aRemote, const char *aAddress);
+                       bool aRemote, const char *aAddress, ULONG aMaskedIfs);
     static DECLCALLBACK(int)
     usbDetachCallback (Console *that, USBDeviceList::iterator *aIt, PCRTUUID aUuid);

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

@@ -129 +129 @@
     Utf8Str name();
 
-    bool requestCapture (SessionMachine *aMachine);
+    bool requestCapture (SessionMachine *aMachine, ULONG aMaskedIfs = 0);
     void requestRelease();
     void requestHold();
@@ -173 +173 @@
      * Only used for host devices. */
     PUSBDEVICE mUsb;
+
+    /** The interface mask to be use in the pending capture. */
+    ULONG mMaskedIfs;
 
     friend class USBProxyService;

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

@@ -358 +358 @@
     };
 
-    /** 
+    /**
      *  Shortcut to AutoStateDependency <AnyStateDep>.
      *  See AutoStateDependency to get the usage pattern.
@@ -371 +371 @@
     typedef AutoStateDependency <AnyStateDep> AutoAnyStateDependency;
 
-    /** 
+    /**
      *  Shortcut to AutoStateDependency <MutableStateDep>.
      *  See AutoStateDependency to get the usage pattern.
@@ -388 +388 @@
     typedef AutoStateDependency <MutableStateDep> AutoMutableStateDependency;
 
-    /** 
+    /**
      *  Shortcut to AutoStateDependency <MutableOrSavedStateDep>.
      *  See AutoStateDependency to get the usage pattern.
@@ -511 +511 @@
     ComObjPtr <SessionMachine> sessionMachine();
 
-    /** 
+    /**
      *  Returns the VirtualBox object this machine belongs to.
      *
@@ -520 +520 @@
     const ComObjPtr <VirtualBox, ComWeakRef> &virtualBox() const { return mParent; }
 
-    /** 
+    /**
      *  Returns this machine's name.
      *
@@ -529 +529 @@
     const Guid &uuid() const { return mData->mUuid; }
 
-    /** 
+    /**
      *  Returns this machine's full settings file path.
      *
@@ -538 +538 @@
     const Bstr &settingsFileFull() const { return mData->mConfigFileFull; }
 
-    /** 
+    /**
      *  Returns this machine's name.
      *
@@ -771 +771 @@
     STDMETHOD(UpdateState)(MachineState_T machineState);
     STDMETHOD(GetIPCId)(BSTR *id);
-    STDMETHOD(RunUSBDeviceFilters) (IUSBDevice *aUSBDevice, BOOL *aMatched);
+    STDMETHOD(RunUSBDeviceFilters) (IUSBDevice *aUSBDevice, BOOL *aMatched, ULONG *aMaskedIfs);
     STDMETHOD(CaptureUSBDevice) (INPTR GUIDPARAM aId);
     STDMETHOD(DetachUSBDevice) (INPTR GUIDPARAM aId, BOOL aDone);
@@ -796 +796 @@
     bool checkForDeath();
 
-#if defined (RT_OS_WINDOWS) 
+#if defined (RT_OS_WINDOWS)
     HANDLE ipcSem() { return mIPCSem; }
 #elif defined (RT_OS_OS2)
@@ -810 +810 @@
     HRESULT onUSBControllerChange();
     HRESULT onUSBDeviceAttach (IUSBDevice *aDevice,
-                               IVirtualBoxErrorInfo *aError);
+                               IVirtualBoxErrorInfo *aError,
+                               ULONG aMaskedIfs);
     HRESULT onUSBDeviceDetach (INPTR GUIDPARAM aId,
                                IVirtualBoxErrorInfo *aError);
     HRESULT onSharedFolderChange();
 
-    bool hasMatchingUSBFilter (const ComObjPtr <HostUSBDevice> &aDevice);
+    bool hasMatchingUSBFilter (const ComObjPtr <HostUSBDevice> &aDevice, ULONG *aMaskedIfs);
 
 private:

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

@@ -99 +99 @@
     STDMETHOD(OnUSBControllerChange)();
     STDMETHOD(OnSharedFolderChange) (BOOL aGlobal);
-    STDMETHOD(OnUSBDeviceAttach) (IUSBDevice *aDevice, IVirtualBoxErrorInfo *aError);
+    STDMETHOD(OnUSBDeviceAttach) (IUSBDevice *aDevice, IVirtualBoxErrorInfo *aError, ULONG aMaskedIfs);
     STDMETHOD(OnUSBDeviceDetach) (INPTR GUIDPARAM aId, IVirtualBoxErrorInfo *aError);
     STDMETHOD(OnShowWindow) (BOOL aCheck, BOOL *aCanShow, ULONG64 *aWinId);

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

@@ -116 +116 @@
                                   BOOL aActiveChanged = FALSE);
 
-    bool hasMatchingFilter (ComObjPtr <HostUSBDevice> &aDevice);
-    bool hasMatchingFilter (IUSBDevice *aUSBDevice);
+    bool hasMatchingFilter (const ComObjPtr <HostUSBDevice> &aDevice, ULONG *aMaskedIfs);
+    bool hasMatchingFilter (IUSBDevice *aUSBDevice, ULONG *aMaskedIfs);
 
     HRESULT notifyProxy (bool aInsertFilters);

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

@@ -69 +69 @@
         typedef matching::Matchable <matching::ParsedBoolFilter> BOOLFilter;
 
-        Data() : mActive (FALSE), mId (NULL) {}
+        Data() : mActive (FALSE), mMaskedIfs (0), mId (NULL) {}
 #ifdef VBOX_WITH_USBFILTER
         Data (const Data &aThat) : mName (aThat.mName), mActive (aThat.mActive),
-            mRemote (aThat.mRemote), mId (NULL)
+            mRemote (aThat.mRemote), mMaskedIfs (aThat.mMaskedIfs) , mId (aThat.mId)
         {
             USBFilterClone (&mUSBFilter, &aThat.mUSBFilter);
@@ -91 +91 @@
                     mSerialNumber.string() == that. mSerialNumber.string() &&
                     mPort.string() == that. mPort.string() &&
-                    mRemote.string() == that. mRemote.string());
+                    mRemote.string() == that. mRemote.string() &&
+                    mMaskedIfs == that. mMaskedIfs);
 #else /* VBOX_WITH_USBFILTER */
             return this == &that
                 || (    mName == that.mName
                     &&  mActive == that.mActive
+                    &&  mMaskedIfs == that.mMaskedIfs
                     &&  USBFilterIsIdentical (&mUSBFilter, &that.mUSBFilter));
 #endif /* VBOX_WITH_USBFILTER */
@@ -116 +118 @@
         BOOLFilter mRemote;
 
+        /** Config value. */
+        ULONG mMaskedIfs;
+
         /** Arbitrary ID field (not used by the class itself) */
         void *mId;
@@ -145 +150 @@
                   INPTR BSTR aManufacturer, INPTR BSTR aProduct,
                   INPTR BSTR aSerialNumber,
-                  INPTR BSTR aPort, INPTR BSTR aRemote);
+                  INPTR BSTR aPort, INPTR BSTR aRemote,
+                  ULONG aMaskedIfs);
     HRESULT init (USBController *aParent, INPTR BSTR aName);
     HRESULT init (USBController *aParent, USBDeviceFilter *aThat,
@@ -173 +179 @@
     STDMETHOD(COMGETTER(Remote)) (BSTR *aRemote);
     STDMETHOD(COMSETTER(Remote)) (INPTR BSTR aRemote);
+    STDMETHOD(COMGETTER(MaskedInterfaces)) (ULONG *aMaskedIfs);
+    STDMETHOD(COMSETTER(MaskedInterfaces)) (ULONG aMaskedIfs);
 
     // public methods only for internal purposes
@@ -290 +298 @@
     STDMETHOD(COMGETTER(Remote)) (BSTR *aRemote);
     STDMETHOD(COMSETTER(Remote)) (INPTR BSTR aRemote);
+    STDMETHOD(COMGETTER(MaskedInterfaces)) (ULONG *aMaskedIfs);
+    STDMETHOD(COMSETTER(MaskedInterfaces)) (ULONG aMaskedIfs);
 
     // IHostUSBDeviceFilter properties

trunk/src/VBox/Main/xml/VirtualBox-settings-common.xsd

@@ -8 +8 @@
 
      Copyright (C) 2004-2007 innotek GmbH
-    
+
      This file is part of VirtualBox Open Source Edition (OSE), as
      available from http://www.virtualbox.org. This file is free software;
@@ -302 +302 @@
   <xsd:attribute name="port" type="xsd:token"/>
   <xsd:attribute name="remote" type="xsd:token"/>
+  <xsd:attribute name="maskedInterfaces" type="xsd:unsignedInt"/>
 </xsd:complexType>