also allow use of XZ for Qemu image compression

* src/qemu_driver.c (enum qemud_save_formats) [QEMUD_SAVE_FORMAT_XZ]:
New member.
[QEMUD_SAVE_FORMAT_LZMA]: Mark as deprecated.
Use an explicit value for each member.
(qemudDomainSave, qemudDomainRestore): Handle the new member.
* src/qemu.conf: Mention xz, too.

diff --git a/src/qemu.conf b/src/qemu.conf
index 06babc4a3514230110c85db1a575850c552c3035..342bb8a19c2e325d636f28fbfe172eb41af042ba 100644 (file)
--- a/src/qemu.conf
+++ b/src/qemu.conf
@@ -134,7 +134,7 @@
 # memory from the domain is dumped out directly to a file.  If you have
 # guests with a large amount of memory, however, this can take up quite
 # a bit of space.  If you would like to compress the images while they
-# are being saved to disk, you can also set "gzip", "bzip2", "lzma"
+# are being saved to disk, you can also set "gzip", "bzip2", "lzma", "xz",
 # or "lzop" for save_image_format.  Note that this means you slow down
 # the process of saving a domain in order to save disk space.
 #

diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index f64d70bd1b390777fb0dbc0d0cbeb4fab14c3402..0cdcd98b5fa83aee553bf1ed84ed1bf80bc30b2a 100644 (file)
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -3619,11 +3619,15 @@ static char *qemudEscapeShellArg(const char *in)
 #define QEMUD_SAVE_VERSION 2
 
 enum qemud_save_formats {
-    QEMUD_SAVE_FORMAT_RAW,
-    QEMUD_SAVE_FORMAT_GZIP,
-    QEMUD_SAVE_FORMAT_BZIP2,
-    QEMUD_SAVE_FORMAT_LZMA,
-    QEMUD_SAVE_FORMAT_LZOP,
+    QEMUD_SAVE_FORMAT_RAW = 0,
+    QEMUD_SAVE_FORMAT_GZIP = 1,
+    QEMUD_SAVE_FORMAT_BZIP2 = 2,
+    QEMUD_SAVE_FORMAT_LZMA = 3,  /* deprecated, in favor of xz */
+    QEMUD_SAVE_FORMAT_LZOP = 4,
+    QEMUD_SAVE_FORMAT_XZ = 5,
+    /* Note: add new members only at the end.
+       These values are used in the on-disk format.
+       Do not change or re-use numbers. */
 };
 
 struct qemud_save_header {
@@ -3666,6 +3670,8 @@ static int qemudDomainSave(virDomainPtr dom,
         header.compressed = QEMUD_SAVE_FORMAT_LZMA;
     else if (STREQ(driver->saveImageFormat, "lzop"))
         header.compressed = QEMUD_SAVE_FORMAT_LZOP;
+    else if (STREQ(driver->saveImageFormat, "xz"))
+        header.compressed = QEMUD_SAVE_FORMAT_XZ;
     else {
         qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED,
                          "%s", _("Invalid save image format specified in configuration file"));
@@ -3761,6 +3767,9 @@ static int qemudDomainSave(virDomainPtr dom,
     else if (header.compressed == QEMUD_SAVE_FORMAT_LZOP)
         internalret = virAsprintf(&command, "migrate \"exec:"
                                   "lzop -c >> '%s' 2>/dev/null\"", safe_path);
+    else if (header.compressed == QEMUD_SAVE_FORMAT_XZ)
+        internalret = virAsprintf(&command, "migrate \"exec:"
+                                  "xz -c >> '%s' 2>/dev/null\"", safe_path);
     else {
         qemudReportError(dom->conn, dom, NULL, VIR_ERR_INTERNAL_ERROR,
                          _("Invalid compress format %d"),
@@ -4385,6 +4394,8 @@ static int qemudDomainRestore(virConnectPtr conn,
             intermediate_argv[0] = "lzma";
         else if (header.compressed == QEMUD_SAVE_FORMAT_LZOP)
             intermediate_argv[0] = "lzop";
+        else if (header.compressed == QEMUD_SAVE_FORMAT_XZ)
+            intermediate_argv[0] = "xz";
         else if (header.compressed != QEMUD_SAVE_FORMAT_RAW) {
             qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
                              _("Unknown compressed save format %d"),