[PATCH v2 08/14] libxl: turn libxlMakeDomainDeviceDiskCaps() to void

libxlMakeDomainDeviceDiskCaps() always returns 0. Signed-off-by: Dmitry Frolov <frolov(a)swemel.ru&gt; --- 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 f419dd9d20..31b6fbc629 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -538,7 +538,7 @@ libxlMakeDomainOSCaps(const char *machine, return; } -static int +static void libxlMakeDomainDeviceDiskCaps(virDomainCapsDeviceDisk *dev) { dev->supported = VIR_TRISTATE_BOOL_YES; @@ -555,7 +555,6 @@ libxlMakeDomainDeviceDiskCaps(virDomainCapsDeviceDisk *dev) VIR_DOMAIN_DISK_BUS_SCSI, VIR_DOMAIN_DISK_BUS_XEN); - return 0; } static int @@ -672,8 +671,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