External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: monitor: Don't add 'props' wrapper if qemu has QEMU_CAPS_OBJECT_QAPIFIED

Browse Source 
Set 'objectAddNoWrap' when the capability is present.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Peter Krempa 2020-11-30 18:30:46 +01:00
parent 71828a7bc0
commit 96850dfe21
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/qemu/qemu_monitor.c
View File

@ -32,6 +32,7 @@
#include "qemu_monitor_json.h" #include "qemu_monitor_json.h"
#include "qemu_domain.h" #include "qemu_domain.h"
#include "qemu_process.h" #include "qemu_process.h"
#include "qemu_capabilities.h"
#include "virerror.h" #include "virerror.h"
#include "viralloc.h" #include "viralloc.h"
#include "virlog.h" #include "virlog.h"
@ -670,6 +671,7 @@ qemuMonitorOpenInternal(virDomainObjPtr vm,
qemuMonitorCallbacksPtr cb, qemuMonitorCallbacksPtr cb,
void *opaque) void *opaque)
{ {
qemuDomainObjPrivatePtr priv = vm->privateData;
qemuMonitorPtr mon; qemuMonitorPtr mon;
g_autoptr(GError) gerr = NULL; g_autoptr(GError) gerr = NULL;
@ -702,6 +704,9 @@ qemuMonitorOpenInternal(virDomainObjPtr vm,
mon->cb = cb; mon->cb = cb;
mon->callbackOpaque = opaque; mon->callbackOpaque = opaque;
if (priv)
mon->objectAddNoWrap = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_OBJECT_QAPIFIED);
if (virSetCloseExec(mon->fd) < 0) { if (virSetCloseExec(mon->fd) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("Unable to set monitor close-on-exec flag")); "%s", _("Unable to set monitor close-on-exec flag"));