The UIUSBCommon::Enable() function is no longer needed as it is a NOP. Drop it. Signed-off-by: Michal Privoznik <mprivozn@xxxxxxxxxx> --- src/vbox/vbox_common.c | 1 - src/vbox/vbox_tmpl.c | 8 -------- src/vbox/vbox_uniformed_api.h | 1 - 3 files changed, 10 deletions(-) diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 4bd118b308..70a9ffbc0d 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -1749,7 +1749,6 @@ vboxAttachUSB(virDomainDef *def, struct _vboxDriver *data, IMachine *machine) rc = gVBoxAPI.UIMachine.GetUSBCommon(machine, &USBCommon); if (NS_FAILED(rc) || !USBCommon) return; - gVBoxAPI.UIUSBCommon.Enable(USBCommon); for (i = 0; i < def->nhostdevs; i++) { char *filtername = NULL; diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index dac195bf49..e611412f7e 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -1678,13 +1678,6 @@ _vrdeServerSetNetAddress(struct _vboxDriver *data, return rc; } -static nsresult -_usbCommonEnable(IUSBCommon *USBCommon G_GNUC_UNUSED) -{ - /* We don't need to set usb enabled for vbox 4.3 and later */ - return 0; -} - static nsresult _usbCommonGetEnabled(IUSBCommon *USBCommon G_GNUC_UNUSED, PRBool *enabled) { @@ -2413,7 +2406,6 @@ static vboxUniformedIVRDEServer _UIVRDEServer = { }; static vboxUniformedIUSBCommon _UIUSBCommon = { - .Enable = _usbCommonEnable, .GetEnabled = _usbCommonGetEnabled, .CreateDeviceFilter = _usbCommonCreateDeviceFilter, .InsertDeviceFilter = _usbCommonInsertDeviceFilter, diff --git a/src/vbox/vbox_uniformed_api.h b/src/vbox/vbox_uniformed_api.h index 3a9c317092..23fb769c37 100644 --- a/src/vbox/vbox_uniformed_api.h +++ b/src/vbox/vbox_uniformed_api.h @@ -354,7 +354,6 @@ typedef struct { /* Common Functions for IUSBController and IUSBDeviceFilters */ typedef struct { - nsresult (*Enable)(IUSBCommon *USBCommon); nsresult (*GetEnabled)(IUSBCommon *USBCommon, PRBool *enabled); nsresult (*CreateDeviceFilter)(IUSBCommon *USBCommon, PRUnichar *name, IUSBDeviceFilter **filter); -- 2.39.1