[PATCH v3 11/13] vbox: turn vboxDumpDisplay() to void

[Dmitry Frolov <frolov@xxxxxxxxx>]

vboxDumpDisplay() always returns 0.

Signed-off-by: Dmitry Frolov <frolov@xxxxxxxxx>
---
 src/vbox/vbox_common.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c
index 9f6612ad61..305c85f4ec 100644
--- a/src/vbox/vbox_common.c
+++ b/src/vbox/vbox_common.c
@@ -3538,7 +3538,7 @@ vboxDumpVideo(virDomainDef *def, struct _vboxDriver *data G_GNUC_UNUSED,
     return 0;
 }
 
-static int
+static void
 vboxDumpDisplay(virDomainDef *def, struct _vboxDriver *data, IMachine *machine)
 {
     /* dump display options vrdp/gui/sdl */
@@ -3549,7 +3549,6 @@ vboxDumpDisplay(virDomainDef *def, struct _vboxDriver *data, IMachine *machine)
     IVRDEServer *VRDEServer = NULL;
     PRBool VRDxEnabled = PR_FALSE;
     virDomainGraphicsDef *graphics = NULL;
-    int ret = -1;
 
     def->ngraphics = 0;
 
@@ -3638,13 +3637,10 @@ vboxDumpDisplay(virDomainDef *def, struct _vboxDriver *data, IMachine *machine)
         VIR_APPEND_ELEMENT(def->graphics, def->ngraphics, graphics);
     }
 
-    ret = 0;
-
     VBOX_RELEASE(VRDEServer);
     VBOX_UTF8_FREE(valueTypeUtf8);
     VBOX_UTF8_FREE(netAddressUtf8);
     virDomainGraphicsDefFree(graphics);
-    return ret;
 }
 
 static int
@@ -4160,8 +4156,7 @@ static char *vboxDomainGetXMLDesc(virDomainPtr dom, unsigned int flags)
 
     if (vboxDumpVideo(def, data, machine) < 0)
         goto cleanup;
-    if (vboxDumpDisplay(def, data, machine) < 0)
-        goto cleanup;
+    vboxDumpDisplay(def, data, machine);
     if (vboxDumpStorageControllers(def, machine) < 0)
         goto cleanup;
     if (vboxDumpDisks(def, data, machine) < 0)
-- 
2.34.1
_______________________________________________
Devel mailing list -- devel@xxxxxxxxxxxxxxxxx
To unsubscribe send an email to devel-leave@xxxxxxxxxxxxxxxxx