[PATCH 2/2] qemu: Rename compressed field of save image header
The corresponding qemu.conf setting is named save_image_format and the
enum of supported format types is declared with name virQEMUSaveFormat.
Let's be consistent and use 'format' instead of 'compressed' as a
field
name in the virQEMUSaveHeader struct.
Signed-off-by: Jim Fehlig <jfehlig(a)suse.com>
---
src/qemu/qemu_saveimage.c | 18 +++++++++---------
src/qemu/qemu_saveimage.h | 4 ++--
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/qemu/qemu_saveimage.c b/src/qemu/qemu_saveimage.c
index 018ab5a222..ffd988bc0b 100644
--- a/src/qemu/qemu_saveimage.c
+++ b/src/qemu/qemu_saveimage.c
@@ -55,8 +55,8 @@ typedef enum {
QEMU_SAVE_FORMAT_LAST
} virQEMUSaveFormat;
-VIR_ENUM_DECL(qemuSaveCompression);
-VIR_ENUM_IMPL(qemuSaveCompression,
+VIR_ENUM_DECL(qemuSaveFormat);
+VIR_ENUM_IMPL(qemuSaveFormat,
QEMU_SAVE_FORMAT_LAST,
"raw",
"gzip",
@@ -72,7 +72,7 @@ qemuSaveImageBswapHeader(virQEMUSaveHeader *hdr)
hdr->version = GUINT32_SWAP_LE_BE(hdr->version);
hdr->data_len = GUINT32_SWAP_LE_BE(hdr->data_len);
hdr->was_running = GUINT32_SWAP_LE_BE(hdr->was_running);
- hdr->compressed = GUINT32_SWAP_LE_BE(hdr->compressed);
+ hdr->format = GUINT32_SWAP_LE_BE(hdr->format);
hdr->cookieOffset = GUINT32_SWAP_LE_BE(hdr->cookieOffset);
}
@@ -97,7 +97,7 @@ virQEMUSaveData *
virQEMUSaveDataNew(char *domXML,
qemuDomainSaveCookie *cookieObj,
bool running,
- int compressed,
+ int format,
virDomainXMLOption *xmlopt)
{
virQEMUSaveData *data = NULL;
@@ -114,7 +114,7 @@ virQEMUSaveDataNew(char *domXML,
memcpy(header->magic, QEMU_SAVE_PARTIAL, sizeof(header->magic));
header->version = QEMU_SAVE_VERSION;
header->was_running = running ? 1 : 0;
- header->compressed = compressed;
+ header->format = format;
data->xml = domXML;
return data;
@@ -230,7 +230,7 @@ static virCommand *
qemuSaveImageGetCompressionCommand(virQEMUSaveFormat compression)
{
virCommand *ret = NULL;
- const char *prog = qemuSaveCompressionTypeToString(compression);
+ const char *prog = qemuSaveFormatTypeToString(compression);
if (!prog) {
virReportError(VIR_ERR_OPERATION_FAILED,
@@ -282,10 +282,10 @@ qemuSaveImageDecompressionStart(virQEMUSaveData *data,
if (header->version != 2)
return 0;
- if (header->compressed == QEMU_SAVE_FORMAT_RAW)
+ if (header->format == QEMU_SAVE_FORMAT_RAW)
return 0;
- if (!(cmd = qemuSaveImageGetCompressionCommand(header->compressed)))
+ if (!(cmd = qemuSaveImageGetCompressionCommand(header->format)))
return -1;
*intermediatefd = *fd;
@@ -475,7 +475,7 @@ qemuSaveImageGetCompressionProgram(const char *imageFormat,
if (!imageFormat)
return QEMU_SAVE_FORMAT_RAW;
- if ((ret = qemuSaveCompressionTypeFromString(imageFormat)) < 0)
+ if ((ret = qemuSaveFormatTypeFromString(imageFormat)) < 0)
goto error;
if (ret == QEMU_SAVE_FORMAT_RAW)
diff --git a/src/qemu/qemu_saveimage.h b/src/qemu/qemu_saveimage.h
index e541792153..0e58dd14b6 100644
--- a/src/qemu/qemu_saveimage.h
+++ b/src/qemu/qemu_saveimage.h
@@ -38,7 +38,7 @@ struct _virQEMUSaveHeader {
uint32_t version;
uint32_t data_len;
uint32_t was_running;
- uint32_t compressed;
+ uint32_t format;
uint32_t cookieOffset;
uint32_t unused[14];
};
@@ -121,7 +121,7 @@ virQEMUSaveData *
virQEMUSaveDataNew(char *domXML,
qemuDomainSaveCookie *cookieObj,
bool running,
- int compressed,
+ int format,
virDomainXMLOption *xmlopt);
void
--
2.35.3