libxlMakeDomainDeviceDiskCaps() returns nothing except 0. Changing return
type to void.
Found by Linux Verification Center (
linuxtesting.org) with SVACE.
Signed-off-by: Dmitry Frolov <frolov(a)swemel.ru>
---
src/libxl/libxl_capabilities.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c
index 9a5ace845d..bb37e5cae2 100644
--- a/src/libxl/libxl_capabilities.c
+++ b/src/libxl/libxl_capabilities.c
@@ -541,7 +541,7 @@ libxlMakeDomainOSCaps(const char *machine,
VIR_TRISTATE_BOOL_YES);
}
-static int
+static void
libxlMakeDomainDeviceDiskCaps(virDomainCapsDeviceDisk *dev)
{
dev->supported = VIR_TRISTATE_BOOL_YES;
@@ -557,8 +557,6 @@ libxlMakeDomainDeviceDiskCaps(virDomainCapsDeviceDisk *dev)
VIR_DOMAIN_DISK_BUS_IDE,
VIR_DOMAIN_DISK_BUS_SCSI,
VIR_DOMAIN_DISK_BUS_XEN);
-
- return 0;
}
static int
@@ -674,8 +672,8 @@ libxlMakeDomainCapabilities(virDomainCaps *domCaps,
domCaps->maxvcpus = PV_MAX_VCPUS;
libxlMakeDomainOSCaps(domCaps->machine, os, firmwares, nfirmwares);
- if (libxlMakeDomainDeviceDiskCaps(disk) < 0 ||
- libxlMakeDomainDeviceGraphicsCaps(graphics) < 0 ||
+ libxlMakeDomainDeviceDiskCaps(disk);
+ if (libxlMakeDomainDeviceGraphicsCaps(graphics) < 0 ||
libxlMakeDomainDeviceVideoCaps(video) < 0)
return -1;
if (STRNEQ(domCaps->machine, "xenpvh") &&
--
2.34.1