From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 30 Nov 2020 17:30:46 +0000 (+0100)
Subject: qemu: monitor: Don't add 'props' wrapper if qemu has QEMU_CAPS_OBJECT_QAPIFIED
X-Git-Tag: v7.2.0-rc1~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96850dfe216f99019978a55027a1e763135ae88f;p=thirdparty%2Flibvirt.git

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>
---

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 1709f7e52c..ec05ac6c43 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"
@@ -670,6 +671,7 @@ qemuMonitorOpenInternal(virDomainObjPtr vm,
                         qemuMonitorCallbacksPtr cb,
                         void *opaque)
 {
+    qemuDomainObjPrivatePtr priv = vm->privateData;
     qemuMonitorPtr mon;
     g_autoptr(GError) gerr = NULL;
 
@@ -702,6 +704,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"));