[PATCH v2 09/14] libxl: turn libxlMakeDomainDeviceGraphicsCaps() to void
libxlMakeDomainDeviceGraphicsCaps() always returns 0.
Signed-off-by: Dmitry Frolov <frolov(a)swemel.ru>
---
src/libxl/libxl_capabilities.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c
index 31b6fbc629..b1e0985b7a 100644
--- a/src/libxl/libxl_capabilities.c
+++ b/src/libxl/libxl_capabilities.c
@@ -557,7 +557,7 @@ libxlMakeDomainDeviceDiskCaps(virDomainCapsDeviceDisk *dev)
}
-static int
+static void
libxlMakeDomainDeviceGraphicsCaps(virDomainCapsDeviceGraphics *dev)
{
dev->supported = VIR_TRISTATE_BOOL_YES;
@@ -568,7 +568,6 @@ libxlMakeDomainDeviceGraphicsCaps(virDomainCapsDeviceGraphics *dev)
VIR_DOMAIN_GRAPHICS_TYPE_VNC,
VIR_DOMAIN_GRAPHICS_TYPE_SPICE);
- return 0;
}
static int
@@ -672,8 +671,8 @@ libxlMakeDomainCapabilities(virDomainCaps *domCaps,
libxlMakeDomainOSCaps(domCaps->machine, os, firmwares, nfirmwares);
libxlMakeDomainDeviceDiskCaps(disk);
- if (libxlMakeDomainDeviceGraphicsCaps(graphics) < 0 ||
- libxlMakeDomainDeviceVideoCaps(video) < 0)
+ libxlMakeDomainDeviceGraphicsCaps(graphics);
+ if (libxlMakeDomainDeviceVideoCaps(video) < 0)
return -1;
if (STRNEQ(domCaps->machine, "xenpvh") &&
libxlMakeDomainDeviceHostdevCaps(hostdev) < 0)
--
2.34.1