]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: Rework qemuMonitorJSONSetMigrationParams
authorJiri Denemark <jdenemar@redhat.com>
Mon, 20 Jun 2016 14:55:07 +0000 (16:55 +0200)
committerJiri Denemark <jdenemar@redhat.com>
Wed, 22 Jun 2016 13:54:21 +0000 (15:54 +0200)
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
src/qemu/qemu_monitor_json.c

index 99678c1c635fd2b4ded8c99681ffb597b694ff8b..0434522ba6e3b67496c25491caf6d4eab8f10c0c 100644 (file)
@@ -2589,20 +2589,19 @@ qemuMonitorJSONSetMigrationParams(qemuMonitorPtr mon,
     if (!(args = virJSONValueNewObject()))
         goto cleanup;
 
-    if (params->compressLevel_set &&
-        virJSONValueObjectAppendNumberInt(args, "compress-level",
-                                          params->compressLevel) < 0)
-        goto cleanup;
+#define APPEND(VAR, FIELD)                                                  \
+    do {                                                                    \
+        if (params->VAR ## _set &&                                          \
+            virJSONValueObjectAppendNumberInt(args, FIELD,                  \
+                                              params->VAR) < 0)             \
+            goto cleanup;                                                   \
+    } while (0)
 
-    if (params->compressThreads_set &&
-        virJSONValueObjectAppendNumberInt(args, "compress-threads",
-                                          params->compressThreads) < 0)
-        goto cleanup;
+    APPEND(compressLevel, "compress-level");
+    APPEND(compressThreads, "compress-threads");
+    APPEND(decompressThreads, "decompress-threads");
 
-    if (params->decompressThreads_set &&
-        virJSONValueObjectAppendNumberInt(args, "decompress-threads",
-                                          params->decompressThreads) < 0)
-        goto cleanup;
+#undef APPEND
 
     if (virJSONValueObjectAppend(cmd, "arguments", args) < 0)
         goto cleanup;