From: Jiri Denemark <jdenemar@redhat.com>
Date: Mon, 20 Jun 2016 13:51:13 +0000 (+0200)
Subject: qemu: Make qemuMonitorSetMigrationCompression saner
X-Git-Tag: v2.0.0-rc1~109
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a235947c29be138f907c64a0ded255faa1da6fd;p=thirdparty%2Flibvirt.git

qemu: Make qemuMonitorSetMigrationCompression saner

Checking whether the function has anything to do is better done in the
function rather then requiring callers to do that.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index a1ce84e442..575d367f36 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -3455,8 +3455,7 @@ qemuMigrationSetCompression(virQEMUDriverPtr driver,
     if (qemuDomainObjEnterMonitorAsync(driver, vm, job) < 0)
         return -1;
 
-    if ((params->level_set || params->threads_set || params->dthreads_set) &&
-        qemuMonitorSetMigrationCompression(priv->mon, params) < 0)
+    if (qemuMonitorSetMigrationCompression(priv->mon, params) < 0)
         goto cleanup;
 
     if (compression->xbzrle_cache_set &&
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index d8e33a98af..f7609e97f7 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -2177,6 +2177,11 @@ qemuMonitorSetMigrationCompression(qemuMonitorPtr mon,
 
     QEMU_CHECK_MONITOR_JSON(mon);
 
+    if (!compress->level_set &&
+        !compress->threads_set &&
+        !compress->dthreads_set)
+        return 0;
+
     return qemuMonitorJSONSetMigrationCompression(mon, compress);
 }