ab887478b0
qemuMonitorJSONSetMigrationParams: Take double pointer for @params qemuMonitorJSONAddObject: Take double pointer for @props :qemuMonitorJSONMakeCommandInternal: Clear @arguments when stolen qemuMonitorAddObject: Fix semantics of @alias qemuMonitorAddObject: Refactor cleanup util: json: Replace virJSONValueObjectSteal by virJSONValueObjectRemoveKey qemu: command: Generate commandline of 'masterKey0' secret via JSON qemu: command: Generate commandline of 'sev0' sev-guest object via JSON qemu: command: Generate commandline of iothread objects JSON qemu: capabilities: Introduce QEMU_CAPS_OBJECT_QAPIFIED qemu: monitor: Make wrapping of 'props' of 'object-add' optional qemuMonitorCreateObjectPropsWrap: Open-code in qemuBuildMemoryBackendProps qemu: monitor: Don't add 'props' wrapper if qemu has QEMU_CAPS_OBJECT_QAPIFIED qemu: command: Use JSON for QAPIfied -object directly tests: qemuxml2argv: Validate generation of JSON props for object-add qemu: capabilities: Enable detection of QEMU_CAPS_OBJECT_QAPIFIED Signed-off-by: yezengruan <yezengruan@huawei.com> (cherry picked from commit da25da87c49d1b576b48fd58614ff43833a04f37)
39 lines
1.1 KiB
Diff
39 lines
1.1 KiB
Diff
From cf227a71451c95d2e5db3d0d79f108caf086234f Mon Sep 17 00:00:00 2001
|
|
From: Peter Krempa <pkrempa@redhat.com>
|
|
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 <pkrempa@redhat.com>
|
|
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
|
|
---
|
|
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
|
|
|