]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: make qemuGetCompressionProgram return int not an enum
authorDaniel P. Berrange <berrange@redhat.com>
Tue, 27 Sep 2016 08:49:20 +0000 (09:49 +0100)
committerDaniel P. Berrange <berrange@redhat.com>
Tue, 27 Sep 2016 08:49:20 +0000 (09:49 +0100)
enum types are unsigned and the qemuGetCompressionProgram
function can return -1 on error. It is therefore inappropriate
to return an enum type. This fixes a build error where the
internal 'ret' variable was used in a comparison with -1

../../src/qemu/qemu_driver.c: In function 'qemuGetCompressionProgram':
../../src/qemu/qemu_driver.c:3280:5: error: comparison of unsigned expression < 0 is always false [-Werror=type-limits]
../../src/qemu/qemu_driver.c:3289:5: error: comparison of unsigned expression < 0 is always false [-Werror=type-limits]
cc1: all warnings being treated as errors

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
src/qemu/qemu_driver.c

index eaea96f8cb95a25d6abbc68be661b8c3ef9cfa56..7873a6814ee762c44198b8c006470521b1a20094 100644 (file)
@@ -3264,13 +3264,13 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, virDomainPtr dom,
  *                           no there was an error, then just return RAW
  *                           indicating none.
  */
-static virQEMUSaveFormat ATTRIBUTE_NONNULL(2)
+static int ATTRIBUTE_NONNULL(2)
 qemuGetCompressionProgram(const char *imageFormat,
                           char **compresspath,
                           const char *styleFormat,
                           bool use_raw_on_fail)
 {
-    virQEMUSaveFormat ret;
+    int ret;
 
     *compresspath = NULL;