From: Peter Krempa Date: Tue, 30 Nov 2021 15:12:00 +0000 (+0100) Subject: qemuMonitorJSONMigrate: Extract flags prior to constructing command X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=32e44f213c1985fc162c5fe579451d416da8e24a;p=libvirt.git qemuMonitorJSONMigrate: Extract flags prior to constructing command The migration API takes specific flags which are then converted to boolean parameters for the command. Extract the flag into helper variables rather than using ternary operators while constructing the command itself. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 652f6b31ab..18156a4fe4 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -3440,13 +3440,15 @@ int qemuMonitorJSONMigrate(qemuMonitor *mon, unsigned int flags, const char *uri) { - g_autoptr(virJSONValue) cmd = - qemuMonitorJSONMakeCommand("migrate", - "b:detach", flags & QEMU_MONITOR_MIGRATE_BACKGROUND ? 1 : 0, - "b:blk", flags & QEMU_MONITOR_MIGRATE_NON_SHARED_DISK ? 1 : 0, - "b:inc", flags & QEMU_MONITOR_MIGRATE_NON_SHARED_INC ? 1 : 0, - "s:uri", uri, - NULL); + bool detach = !!(flags & QEMU_MONITOR_MIGRATE_BACKGROUND); + bool blk = !!(flags & QEMU_MONITOR_MIGRATE_NON_SHARED_DISK); + bool inc = !!(flags & QEMU_MONITOR_MIGRATE_NON_SHARED_INC); + g_autoptr(virJSONValue) cmd = qemuMonitorJSONMakeCommand("migrate", + "b:detach", detach, + "b:blk", blk, + "b:inc", inc, + "s:uri", uri, + NULL); g_autoptr(virJSONValue) reply = NULL; if (!cmd)