qemu: Use 'virQEMUSaveFormat' type everywhere except qemu_conf

Convert all code refering to the save image type to use the proper enum
value.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index f2e024dae374b129408756c6f3f976662d5ef81b..d88c0833ad1ed4b39a117390854cbafc1afc8fd4 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -2583,7 +2583,7 @@ static int
 qemuDomainSaveInternal(virQEMUDriver *driver,
                        virDomainObj *vm,
                        const char *path,
-                       int format,
+                       virQEMUSaveFormat format,
                        virCommand *compressor,
                        const char *xmlin,
                        virTypedParameterPtr params,
@@ -2823,7 +2823,7 @@ qemuDomainSaveParams(virDomainPtr dom,
     const char *to = NULL;
     const char *dxml = NULL;
     const char *formatstr = NULL;
-    int format = cfg->saveImageFormat;
+    virQEMUSaveFormat format = cfg->saveImageFormat;
     int ret = -1;
 
     virCheckFlags(VIR_DOMAIN_SAVE_BYPASS_CACHE |
@@ -2863,10 +2863,16 @@ qemuDomainSaveParams(virDomainPtr dom,
         return qemuDomainManagedSaveHelper(driver, vm, dxml, flags);
     }
 
-    if (formatstr && (format = qemuSaveFormatTypeFromString(formatstr)) < 0) {
-        virReportError(VIR_ERR_OPERATION_FAILED,
-                       _("Invalid image_format '%1$s'"), formatstr);
-        goto cleanup;
+    if (formatstr) {
+        int formatVal;
+
+        if ((formatVal = qemuSaveFormatTypeFromString(formatstr)) < 0) {
+            virReportError(VIR_ERR_OPERATION_FAILED,
+                           _("Invalid image_format '%1$s'"), formatstr);
+            goto cleanup;
+        }
+
+        format = formatVal;
     }
 
     if (qemuSaveImageGetCompressionProgram(format, &compressor, "save") < 0)

diff --git a/src/qemu/qemu_saveimage.c b/src/qemu/qemu_saveimage.c
index 145a0f483283f68f04fdc0809b4f5443b812a946..48f8220dee991339c9862651dd63bd181377e143 100644 (file)
--- a/src/qemu/qemu_saveimage.c
+++ b/src/qemu/qemu_saveimage.c
@@ -79,7 +79,7 @@ virQEMUSaveData *
 virQEMUSaveDataNew(char *domXML,
                    qemuDomainSaveCookie *cookieObj,
                    bool running,
-                   int format,
+                   virQEMUSaveFormat format,
                    virDomainXMLOption *xmlopt)
 {
     virQEMUSaveData *data = NULL;
@@ -551,7 +551,7 @@ qemuSaveImageCreate(virQEMUDriver *driver,
  * Returns -1 on failure, 0 on success.
  */
 int
-qemuSaveImageGetCompressionProgram(int format,
+qemuSaveImageGetCompressionProgram(virQEMUSaveFormat format,
                                    virCommand **compressor,
                                    const char *styleFormat)
 {

diff --git a/src/qemu/qemu_saveimage.h b/src/qemu/qemu_saveimage.h
index 15b73eb395751d05fcd222d6a8ccf8c8ed4e779f..0a22ee5f05f7fcf6f375fb8919472940cf86f319 100644 (file)
--- a/src/qemu/qemu_saveimage.h
+++ b/src/qemu/qemu_saveimage.h
@@ -114,7 +114,7 @@ qemuSaveImageOpen(virQEMUDriver *driver,
     ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4);
 
 int
-qemuSaveImageGetCompressionProgram(int format,
+qemuSaveImageGetCompressionProgram(virQEMUSaveFormat format,
                                    virCommand **compressor,
                                    const char *styleFormat)
     ATTRIBUTE_NONNULL(2);
@@ -153,7 +153,7 @@ virQEMUSaveData *
 virQEMUSaveDataNew(char *domXML,
                    qemuDomainSaveCookie *cookieObj,
                    bool running,
-                   int format,
+                   virQEMUSaveFormat format,
                    virDomainXMLOption *xmlopt);
 
 void