diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 6d26e7c051..5a957e9bef 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -2947,7 +2947,6 @@ static void vboxHostDeviceGetXMLDesc(struct _vboxDriver *data, virDomainDef *def, IMachine *machine) { IUSBCommon *USBCommon = NULL; - PRBool enabled = PR_FALSE; vboxArray deviceFilters = VBOX_ARRAY_INITIALIZER; size_t i; PRUint32 USBFilterCount = 0; @@ -2958,10 +2957,6 @@ vboxHostDeviceGetXMLDesc(struct _vboxDriver *data, virDomainDef *def, IMachine * if (!USBCommon) return; - gVBoxAPI.UIUSBCommon.GetEnabled(USBCommon, &enabled); - if (!enabled) - goto release_controller; - gVBoxAPI.UArray.vboxArrayGet(&deviceFilters, USBCommon, gVBoxAPI.UArray.handleUSBGetDeviceFilters(USBCommon)); @@ -3036,7 +3031,6 @@ vboxHostDeviceGetXMLDesc(struct _vboxDriver *data, virDomainDef *def, IMachine * release_filters: gVBoxAPI.UArray.vboxArrayRelease(&deviceFilters); - release_controller: VBOX_RELEASE(USBCommon); return; diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 5cd30ed019..595f8c0e22 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -1679,13 +1679,6 @@ _vrdeServerSetNetAddress(struct _vboxDriver *data, return rc; } -static nsresult -_usbCommonGetEnabled(IUSBCommon *USBCommon G_GNUC_UNUSED, PRBool *enabled) -{ - *enabled = true; - return 0; -} - static nsresult _usbCommonCreateDeviceFilter(IUSBCommon *USBCommon, PRUnichar *name, IUSBDeviceFilter **filter) @@ -2407,7 +2400,6 @@ static vboxUniformedIVRDEServer _UIVRDEServer = { }; static vboxUniformedIUSBCommon _UIUSBCommon = { - .GetEnabled = _usbCommonGetEnabled, .CreateDeviceFilter = _usbCommonCreateDeviceFilter, .InsertDeviceFilter = _usbCommonInsertDeviceFilter, }; diff --git a/src/vbox/vbox_uniformed_api.h b/src/vbox/vbox_uniformed_api.h index 23fb769c37..9c820b8d24 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 (*GetEnabled)(IUSBCommon *USBCommon, PRBool *enabled); nsresult (*CreateDeviceFilter)(IUSBCommon *USBCommon, PRUnichar *name, IUSBDeviceFilter **filter); nsresult (*InsertDeviceFilter)(IUSBCommon *USBCommon, PRUint32 position,