vbox: Drop UIUSBCommon::GetEnabled()

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>

diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c
index 6d26e7c05142c9b5b466e66d18f3d305461e63e3..5a957e9befcbff07c7f2ce2144f717f50428f069 100644 (file)
--- 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 5cd30ed01917ee701b0afd92285885e226ef715f..595f8c0e2208d40d7dffebdf563382f0b4453ac6 100644 (file)
--- 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 23fb769c374a22c20740539059ae14dc4f0b597f..9c820b8d24f1501ad700f4bb9f94de2f78f0fca7 100644 (file)
--- 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,