From: Peter Krempa <pkrempa@redhat.com> Convert all code refering to the save image type to use the proper enum value. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/qemu/qemu_driver.c | 18 ++++++++++++------ src/qemu/qemu_saveimage.c | 4 ++-- src/qemu/qemu_saveimage.h | 4 ++-- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f2e024dae3..d88c0833ad 100644 --- 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 145a0f4832..48f8220dee 100644 --- 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 15b73eb395..0a22ee5f05 100644 --- 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 -- 2.52.0