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)
78 lines
2.1 KiB
Diff
78 lines
2.1 KiB
Diff
From a9516cceecbf98e34619e2978192f50665d82528 Mon Sep 17 00:00:00 2001
|
|
From: Peter Krempa <pkrempa@redhat.com>
|
|
Date: Mon, 30 Nov 2020 16:23:55 +0100
|
|
Subject: [PATCH 05/16] qemuMonitorAddObject: Refactor cleanup
|
|
|
|
Remove freeing/clearing of @props as the function doesn't guarantee that
|
|
it happens on success, rename the variable hodling copy of the alias and
|
|
use g_autofree to automatically free it and remove the cleanup label as
|
|
well as 'ret' variable.
|
|
|
|
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
|
|
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
|
|
---
|
|
src/qemu/qemu_monitor.c | 23 ++++++++---------------
|
|
1 file changed, 8 insertions(+), 15 deletions(-)
|
|
|
|
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
|
|
index f573292e37..188d7700a7 100644
|
|
--- a/src/qemu/qemu_monitor.c
|
|
+++ b/src/qemu/qemu_monitor.c
|
|
@@ -2940,13 +2940,12 @@ qemuMonitorAddObject(qemuMonitorPtr mon,
|
|
{
|
|
const char *type = NULL;
|
|
const char *id = NULL;
|
|
- char *tmp = NULL;
|
|
- int ret = -1;
|
|
+ g_autofree char *aliasCopy = NULL;
|
|
|
|
if (!*props) {
|
|
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
|
|
_("object props can't be NULL"));
|
|
- goto cleanup;
|
|
+ return -1;
|
|
}
|
|
|
|
type = virJSONValueObjectGetString(*props, "qom-type");
|
|
@@ -2954,31 +2953,25 @@ qemuMonitorAddObject(qemuMonitorPtr mon,
|
|
|
|
VIR_DEBUG("type=%s id=%s", NULLSTR(type), NULLSTR(id));
|
|
|
|
- QEMU_CHECK_MONITOR_GOTO(mon, cleanup);
|
|
+ QEMU_CHECK_MONITOR(mon);
|
|
|
|
if (!id || !type) {
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
_("missing alias or qom-type for qemu object '%s'"),
|
|
NULLSTR(type));
|
|
- goto cleanup;
|
|
+ return -1;
|
|
}
|
|
|
|
if (alias)
|
|
- tmp = g_strdup(id);
|
|
+ aliasCopy = g_strdup(id);
|
|
|
|
if (qemuMonitorJSONAddObject(mon, props) < 0)
|
|
- goto cleanup;
|
|
+ return -1;
|
|
|
|
if (alias)
|
|
- *alias = g_steal_pointer(&tmp);
|
|
-
|
|
- ret = 0;
|
|
+ *alias = g_steal_pointer(&aliasCopy);
|
|
|
|
- cleanup:
|
|
- VIR_FREE(tmp);
|
|
- virJSONValueFree(*props);
|
|
- *props = NULL;
|
|
- return ret;
|
|
+ return 0;
|
|
}
|
|
|
|
|
|
--
|
|
2.27.0
|
|
|