NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

vbox: Drop UIUSBCommon::GetEnabled()

Browse Source 
The UIUSBCommon::GetEnabled() function is not needed really, as
it sets a boolean to true and always succeeds. We can live
without the function.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Michal Privoznik 2023-01-22 13:06:31 +01:00
parent 18b7857426
commit 8a96d7b363
3 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/vbox/vbox_common.c
View File

@ -2947,7 +2947,6 @@ static void
vboxHostDeviceGetXMLDesc(struct _vboxDriver *data, virDomainDef *def, IMachine *machine) vboxHostDeviceGetXMLDesc(struct _vboxDriver *data, virDomainDef *def, IMachine *machine)
{ {
IUSBCommon *USBCommon = NULL; IUSBCommon *USBCommon = NULL;
PRBool enabled = PR_FALSE;
vboxArray deviceFilters = VBOX_ARRAY_INITIALIZER; vboxArray deviceFilters = VBOX_ARRAY_INITIALIZER;
size_t i; size_t i;
PRUint32 USBFilterCount = 0; PRUint32 USBFilterCount = 0;
@ -2958,10 +2957,6 @@ vboxHostDeviceGetXMLDesc(struct _vboxDriver *data, virDomainDef *def, IMachine *
if (!USBCommon) if (!USBCommon)
return; return;
gVBoxAPI.UIUSBCommon.GetEnabled(USBCommon, &enabled);
if (!enabled)
goto release_controller;
gVBoxAPI.UArray.vboxArrayGet(&deviceFilters, USBCommon, gVBoxAPI.UArray.vboxArrayGet(&deviceFilters, USBCommon,
gVBoxAPI.UArray.handleUSBGetDeviceFilters(USBCommon)); gVBoxAPI.UArray.handleUSBGetDeviceFilters(USBCommon));
@ -3036,7 +3031,6 @@ vboxHostDeviceGetXMLDesc(struct _vboxDriver *data, virDomainDef *def, IMachine *
release_filters: release_filters:
gVBoxAPI.UArray.vboxArrayRelease(&deviceFilters); gVBoxAPI.UArray.vboxArrayRelease(&deviceFilters);
release_controller:
VBOX_RELEASE(USBCommon); VBOX_RELEASE(USBCommon);
return; return;

8
src/vbox/vbox_tmpl.c
View File

@ -1679,13 +1679,6 @@ _vrdeServerSetNetAddress(struct _vboxDriver *data,
return rc; return rc;
} }
static nsresult
_usbCommonGetEnabled(IUSBCommon *USBCommon G_GNUC_UNUSED, PRBool *enabled)
{
*enabled = true;
return 0;
}
static nsresult static nsresult
_usbCommonCreateDeviceFilter(IUSBCommon *USBCommon, PRUnichar *name, _usbCommonCreateDeviceFilter(IUSBCommon *USBCommon, PRUnichar *name,
IUSBDeviceFilter **filter) IUSBDeviceFilter **filter)
@ -2407,7 +2400,6 @@ static vboxUniformedIVRDEServer _UIVRDEServer = {
}; };
static vboxUniformedIUSBCommon _UIUSBCommon = { static vboxUniformedIUSBCommon _UIUSBCommon = {
.GetEnabled = _usbCommonGetEnabled,
.CreateDeviceFilter = _usbCommonCreateDeviceFilter, .CreateDeviceFilter = _usbCommonCreateDeviceFilter,
.InsertDeviceFilter = _usbCommonInsertDeviceFilter, .InsertDeviceFilter = _usbCommonInsertDeviceFilter,
}; };

1
src/vbox/vbox_uniformed_api.h
View File

@ -354,7 +354,6 @@ typedef struct {
/* Common Functions for IUSBController and IUSBDeviceFilters */ /* Common Functions for IUSBController and IUSBDeviceFilters */
typedef struct { typedef struct {
nsresult (*GetEnabled)(IUSBCommon *USBCommon, PRBool *enabled);
nsresult (*CreateDeviceFilter)(IUSBCommon *USBCommon, PRUnichar *name, nsresult (*CreateDeviceFilter)(IUSBCommon *USBCommon, PRUnichar *name,
IUSBDeviceFilter **filter); IUSBDeviceFilter **filter);
nsresult (*InsertDeviceFilter)(IUSBCommon *USBCommon, PRUint32 position, nsresult (*InsertDeviceFilter)(IUSBCommon *USBCommon, PRUint32 position,