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::Enable()

Browse Source 
The UIUSBCommon::Enable() function is no longer needed as it is a
NOP. Drop it.

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:04:52 +01:00
parent 6f0ed13b52
commit 18b7857426
3 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/vbox/vbox_common.c
View File

@ -1749,7 +1749,6 @@ vboxAttachUSB(virDomainDef *def, struct _vboxDriver *data, IMachine *machine)
rc = gVBoxAPI.UIMachine.GetUSBCommon(machine, &USBCommon); rc = gVBoxAPI.UIMachine.GetUSBCommon(machine, &USBCommon);
if (NS_FAILED(rc) || !USBCommon) if (NS_FAILED(rc) || !USBCommon)
return; return;
gVBoxAPI.UIUSBCommon.Enable(USBCommon);
for (i = 0; i < def->nhostdevs; i++) { for (i = 0; i < def->nhostdevs; i++) {
char *filtername = NULL; char *filtername = NULL;

8
src/vbox/vbox_tmpl.c
View File

@ -1679,13 +1679,6 @@ _vrdeServerSetNetAddress(struct _vboxDriver *data,
return rc; 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 static nsresult
_usbCommonGetEnabled(IUSBCommon *USBCommon G_GNUC_UNUSED, PRBool *enabled) _usbCommonGetEnabled(IUSBCommon *USBCommon G_GNUC_UNUSED, PRBool *enabled)
{ {
@ -2414,7 +2407,6 @@ static vboxUniformedIVRDEServer _UIVRDEServer = {
}; };
static vboxUniformedIUSBCommon _UIUSBCommon = { static vboxUniformedIUSBCommon _UIUSBCommon = {
.Enable = _usbCommonEnable,
.GetEnabled = _usbCommonGetEnabled, .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 (*Enable)(IUSBCommon *USBCommon);
nsresult (*GetEnabled)(IUSBCommon *USBCommon, PRBool *enabled); nsresult (*GetEnabled)(IUSBCommon *USBCommon, PRBool *enabled);
nsresult (*CreateDeviceFilter)(IUSBCommon *USBCommon, PRUnichar *name, nsresult (*CreateDeviceFilter)(IUSBCommon *USBCommon, PRUnichar *name,
IUSBDeviceFilter **filter); IUSBDeviceFilter **filter);