From b5d8d4b0253fd0e9232ffafc869af2f93b4163e5 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Wed, 4 Mar 2020 10:10:56 +0100 Subject: [PATCH] qemuMonitorJSONSetMigrationParams: Refactor command construction and cleanup qemuMonitorJSONMakeCommandInternal does the full command construction if you pass in what would become the value of the 'arguments' key. Refactor the open-coded implementation to use the helper and use modern cleanup helpers at the same time. Signed-off-by: Peter Krempa Reviewed-by: Daniel Henrique Barboza --- src/qemu/qemu_monitor_json.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 5f0185d10b..3eac80c060 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -3440,30 +3440,19 @@ int qemuMonitorJSONSetMigrationParams(qemuMonitorPtr mon, virJSONValuePtr params) { - int ret = -1; - virJSONValuePtr cmd = virJSONValueNewObject(); - virJSONValuePtr reply = NULL; + g_autoptr(virJSONValue) cmd = NULL; + g_autoptr(virJSONValue) reply = NULL; - if (virJSONValueObjectAppendString(cmd, "execute", - "migrate-set-parameters") < 0) - goto cleanup; - - if (virJSONValueObjectAppend(cmd, "arguments", params) < 0) - goto cleanup; - params = NULL; + if (!(cmd = qemuMonitorJSONMakeCommandInternal("migrate-set-parameters", params))) + return -1; if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) - goto cleanup; + return -1; if (qemuMonitorJSONCheckError(cmd, reply) < 0) - goto cleanup; + return -1; - ret = 0; - cleanup: - virJSONValueFree(cmd); - virJSONValueFree(params); - virJSONValueFree(reply); - return ret; + return 0; }