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)
48 lines
1.5 KiB
Diff
48 lines
1.5 KiB
Diff
From 25f25258f0574822834c459eb414eba217b23f23 Mon Sep 17 00:00:00 2001
|
|
From: Peter Krempa <pkrempa@redhat.com>
|
|
Date: Mon, 30 Nov 2020 18:30:46 +0100
|
|
Subject: [PATCH 13/16] qemu: monitor: Don't add 'props' wrapper if qemu has
|
|
QEMU_CAPS_OBJECT_QAPIFIED
|
|
|
|
Set 'objectAddNoWrap' when the capability is present.
|
|
|
|
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
|
|
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
|
|
---
|
|
src/qemu/qemu_monitor.c | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
|
|
index dd1bf925b2..ec79fa6368 100644
|
|
--- a/src/qemu/qemu_monitor.c
|
|
+++ b/src/qemu/qemu_monitor.c
|
|
@@ -32,6 +32,7 @@
|
|
#include "qemu_monitor_json.h"
|
|
#include "qemu_domain.h"
|
|
#include "qemu_process.h"
|
|
+#include "qemu_capabilities.h"
|
|
#include "virerror.h"
|
|
#include "viralloc.h"
|
|
#include "virlog.h"
|
|
@@ -666,6 +667,7 @@ qemuMonitorOpenInternal(virDomainObjPtr vm,
|
|
qemuMonitorCallbacksPtr cb,
|
|
void *opaque)
|
|
{
|
|
+ qemuDomainObjPrivatePtr priv = vm->privateData;
|
|
qemuMonitorPtr mon;
|
|
g_autoptr(GError) gerr = NULL;
|
|
|
|
@@ -698,6 +700,9 @@ qemuMonitorOpenInternal(virDomainObjPtr vm,
|
|
mon->cb = cb;
|
|
mon->callbackOpaque = opaque;
|
|
|
|
+ if (priv)
|
|
+ mon->objectAddNoWrap = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_OBJECT_QAPIFIED);
|
|
+
|
|
if (virSetCloseExec(mon->fd) < 0) {
|
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
"%s", _("Unable to set monitor close-on-exec flag"));
|
|
--
|
|
2.27.0
|
|
|