[PATCH 03/10] qemu: domain: remove monJSON field

[Ján Tomko <jtomko@xxxxxxxxxx>]

If we have a monitor, it is a JSON monitor.

Signed-off-by: Ján Tomko <jtomko@xxxxxxxxxx>
---
 src/qemu/qemu_domain.c  | 3 ---
 src/qemu/qemu_domain.h  | 1 -
 src/qemu/qemu_process.c | 1 -
 tests/qemuhotplugtest.c | 2 --
 4 files changed, 7 deletions(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 84c777827a..0b88b1b98b 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -2904,9 +2904,6 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt,
         priv->monConfig->type = VIR_DOMAIN_CHR_TYPE_PTY;
     VIR_FREE(tmp);
 
-    priv->monJSON = virXPathBoolean("count(./monitor[@json = '1']) > 0",
-                                    ctxt) > 0;
-
     switch (priv->monConfig->type) {
     case VIR_DOMAIN_CHR_TYPE_PTY:
         priv->monConfig->data.file.path = monitorpath;
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index f92f0dbc27..a9d36ff5a5 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -281,7 +281,6 @@ struct _qemuDomainObjPrivate {
 
     qemuMonitorPtr mon;
     virDomainChrSourceDefPtr monConfig;
-    bool monJSON;
     bool monError;
     unsigned long long monStart;
 
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index bf6b76413c..def60596b0 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -6177,7 +6177,6 @@ qemuProcessPrepareDomain(virQEMUDriverPtr driver,
     if (qemuProcessPrepareMonitorChr(priv->monConfig, priv->libDir) < 0)
         goto cleanup;
 
-    priv->monJSON = true;
     priv->monError = false;
     priv->monStart = 0;
     priv->runningReason = VIR_DOMAIN_RUNNING_UNKNOWN;
diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c
index bfbf32baa4..e162b1d8db 100644
--- a/tests/qemuhotplugtest.c
+++ b/tests/qemuhotplugtest.c
@@ -298,7 +298,6 @@ testQemuHotplug(const void *data)
 
     priv = vm->privateData;
     priv->mon = qemuMonitorTestGetMonitor(test_mon);
-    priv->monJSON = true;
 
     /* XXX We need to unlock the monitor here, as
      * qemuDomainObjEnterMonitorInternal (called from qemuDomainChangeGraphics)
@@ -441,7 +440,6 @@ testQemuHotplugCpuPrepare(const char *test,
         goto error;
 
     priv->mon = qemuMonitorTestGetMonitor(data->mon);
-    priv->monJSON = true;
     virObjectUnlock(priv->mon);
 
     if (qemuDomainRefreshVcpuInfo(&driver, data->vm, 0, false) < 0)
-- 
2.20.1

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list