qemu: domain: remove monJSON field

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

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Acked-by: Peter Krempa <pkrempa@redhat.com>

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index d92083614db0350cb5ea0981524e4be42ad0e280..5b5263ab66312d6aceac7c9d6582a6dd15ebb4bb 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -2903,9 +2903,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 a731ae19109a5a0939840a54eb327966fed49935..7223547e78cd0a849e1cf922a8a2f20babc9c75b 100644 (file)
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -280,7 +280,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 9f04fc1f57a7fc78176509a8f1d70ccafc2de433..a8e17d3c12a6569e107fa269c0df6d4df7383db4 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -6195,7 +6195,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 b659565a48b102fa56cd86941ae56f31da66d0be..354068d7481e804421d99d516515e52d727027bd 100644 (file)
--- 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)