[PATCH v4 10/19] libxl: change type to void libxlMakeDomainOSCaps()

[Dmitry Frolov <frolov@xxxxxxxxx>]

libxlMakeDomainOSCaps() returns nothing except 0. Changing return
type to void.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Signed-off-by: Dmitry Frolov <frolov@xxxxxxxxx>
---
 src/libxl/libxl_capabilities.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c
index f2ab338e74..9a5ace845d 100644
--- a/src/libxl/libxl_capabilities.c
+++ b/src/libxl/libxl_capabilities.c
@@ -509,7 +509,7 @@ libxlCapsInitGuests(libxl_ctx *ctx, virCaps *caps)
     return 0;
 }
 
-static int
+static void
 libxlMakeDomainOSCaps(const char *machine,
                       virDomainCapsOS *os,
                       virFirmware **firmwares,
@@ -524,7 +524,7 @@ libxlMakeDomainOSCaps(const char *machine,
     capsLoader->readonly.report = true;
 
     if (STREQ(machine, "xenpv") || STREQ(machine, "xenpvh"))
-        return 0;
+        return;
 
     capsLoader->supported = VIR_TRISTATE_BOOL_YES;
     capsLoader->values.values = g_new0(char *, nfirmwares);
@@ -539,8 +539,6 @@ libxlMakeDomainOSCaps(const char *machine,
                              VIR_DOMAIN_LOADER_TYPE_PFLASH);
     VIR_DOMAIN_CAPS_ENUM_SET(capsLoader->readonly,
                              VIR_TRISTATE_BOOL_YES);
-
-    return 0;
 }
 
 static int
@@ -675,8 +673,8 @@ libxlMakeDomainCapabilities(virDomainCaps *domCaps,
     else
         domCaps->maxvcpus = PV_MAX_VCPUS;
 
-    if (libxlMakeDomainOSCaps(domCaps->machine, os, firmwares, nfirmwares) < 0 ||
-        libxlMakeDomainDeviceDiskCaps(disk) < 0 ||
+    libxlMakeDomainOSCaps(domCaps->machine, os, firmwares, nfirmwares);
+    if (libxlMakeDomainDeviceDiskCaps(disk) < 0 ||
         libxlMakeDomainDeviceGraphicsCaps(graphics) < 0 ||
         libxlMakeDomainDeviceVideoCaps(video) < 0)
         return -1;
-- 
2.34.1
_______________________________________________
Devel mailing list -- devel@xxxxxxxxxxxxxxxxx
To unsubscribe send an email to devel-leave@xxxxxxxxxxxxxxxxx