From cf227a71451c95d2e5db3d0d79f108caf086234f Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Mon, 30 Nov 2020 16:21:18 +0100 Subject: [PATCH 04/16] qemuMonitorAddObject: Fix semantics of @alias The callers of qemuMonitorAddObject rely on the fact that @alias is filled only when the object is added successfully. This is documented but the code didn't behave like that. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/qemu/qemu_monitor.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 0447b609fd..f573292e37 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -2966,11 +2966,14 @@ qemuMonitorAddObject(qemuMonitorPtr mon, if (alias) tmp = g_strdup(id); - ret = qemuMonitorJSONAddObject(mon, props); + if (qemuMonitorJSONAddObject(mon, props) < 0) + goto cleanup; if (alias) *alias = g_steal_pointer(&tmp); + ret = 0; + cleanup: VIR_FREE(tmp); virJSONValueFree(*props); -- 2.27.0