qemu: stop formatting json='1' in status XML

For quite some time now it is impossible to connect to a domain
using a HMP monitor, so there is no point in formatting it in the status
XML.

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 6225ac23e2f70793406bf929782e6798de8fb6cd..0f1fda2384c65a8706008430e33619f870eaa745 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -2474,7 +2474,6 @@ qemuDomainObjPrivateXMLFormat(virBufferPtr buf,
         }
 
         virBufferEscapeString(buf, "<monitor path='%s'", monitorpath);
-        virBufferAddLit(buf, " json='1'");
         virBufferAsprintf(buf, " type='%s'/>\n",
                           virDomainChrTypeToString(priv->monConfig->type));
     }

diff --git a/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml b/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml
index df23ac00aa5c84391b1fec5569f78098d3f20408..0fba3b69e70e9b79a3f5a71dd6c12db4f01f123a 100644 (file)
--- a/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml
+++ b/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml
@@ -1,6 +1,6 @@
 <domstatus state='running' reason='booted' pid='3803518'>
   <taint flag='high-privileges'/>
-  <monitor path='/var/lib/libvirt/qemu/test.monitor' json='1' type='unix'/>
+  <monitor path='/var/lib/libvirt/qemu/test.monitor' type='unix'/>
   <vcpus>
     <vcpu id='0' pid='3803519'/>
   </vcpus>

diff --git a/tests/qemustatusxml2xmldata/disk-secinfo-upgrade-out.xml b/tests/qemustatusxml2xmldata/disk-secinfo-upgrade-out.xml
index 7a26e93aa4ab89f5c385382a23cfb13bc184bf57..3d5e8f1438f85527b4afacf1575937919e21f7d5 100644 (file)
--- a/tests/qemustatusxml2xmldata/disk-secinfo-upgrade-out.xml
+++ b/tests/qemustatusxml2xmldata/disk-secinfo-upgrade-out.xml
@@ -1,5 +1,5 @@
 <domstatus state='running' reason='booted' pid='195139'>
-  <monitor path='/var/lib/libvirt/qemu/domain-1-upstream/monitor.sock' json='1' type='unix'/>
+  <monitor path='/var/lib/libvirt/qemu/domain-1-upstream/monitor.sock' type='unix'/>
   <namespaces>
     <mount/>
   </namespaces>

diff --git a/tests/qemustatusxml2xmldata/migration-in-params-in.xml b/tests/qemustatusxml2xmldata/migration-in-params-in.xml
index 03f18b4f3d5ce5caae777b97b8fe4098ffbd3653..80cc4b4666f5214891a8871b8e745a98e13ed0bd 100644 (file)
--- a/tests/qemustatusxml2xmldata/migration-in-params-in.xml
+++ b/tests/qemustatusxml2xmldata/migration-in-params-in.xml
@@ -1,7 +1,7 @@
 <domstatus state='paused' reason='migration' pid='2296'>
   <taint flag='high-privileges'/>
   <taint flag='host-cpu'/>
-  <monitor path='/var/lib/libvirt/qemu/domain-1-nest/monitor.sock' json='1' type='unix'/>
+  <monitor path='/var/lib/libvirt/qemu/domain-1-nest/monitor.sock' type='unix'/>
   <namespaces>
     <mount/>
   </namespaces>

diff --git a/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml b/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml
index 315d8e4c1ab2b934636a12ace68553b77921a7e5..455c30be85f60813ce748bb13e30be0ab1f73926 100644 (file)
--- a/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml
+++ b/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml
@@ -1,6 +1,6 @@
 <domstatus state='running' reason='booted' pid='15433'>
   <taint flag='high-privileges'/>
-  <monitor path='/var/lib/libvirt/qemu/domain-4-upstream/monitor.sock' json='1' type='unix'/>
+  <monitor path='/var/lib/libvirt/qemu/domain-4-upstream/monitor.sock' type='unix'/>
   <vcpus>
     <vcpu id='0' pid='15449'/>
     <vcpu id='1' pid='15450'/>

diff --git a/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml b/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml
index 869f37d488ea0512ff2654186527bb5aa62bea9f..409e97a91887d3b159f3a238712396cb76afa362 100644 (file)
--- a/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml
+++ b/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml
@@ -1,6 +1,6 @@
 <domstatus state='running' reason='booted' pid='68472'>
   <taint flag='high-privileges'/>
-  <monitor path='/var/lib/libvirt/qemu/domain-3-upstream/monitor.sock' json='1' type='unix'/>
+  <monitor path='/var/lib/libvirt/qemu/domain-3-upstream/monitor.sock' type='unix'/>
   <namespaces>
     <mount/>
   </namespaces>

diff --git a/tests/qemustatusxml2xmldata/migration-out-params-in.xml b/tests/qemustatusxml2xmldata/migration-out-params-in.xml
index ae2064830af4396b64662d03634ea710279aad86..4a660281d2aadbbde837ae1af48ae2dc77b05527 100644 (file)
--- a/tests/qemustatusxml2xmldata/migration-out-params-in.xml
+++ b/tests/qemustatusxml2xmldata/migration-out-params-in.xml
@@ -1,7 +1,7 @@
 <domstatus state='paused' reason='migration' pid='21586'>
   <taint flag='high-privileges'/>
   <taint flag='host-cpu'/>
-  <monitor path='/var/lib/libvirt/qemu/domain-7-nest/monitor.sock' json='1' type='unix'/>
+  <monitor path='/var/lib/libvirt/qemu/domain-7-nest/monitor.sock' type='unix'/>
   <namespaces>
     <mount/>
   </namespaces>

diff --git a/tests/qemustatusxml2xmldata/modern-in.xml b/tests/qemustatusxml2xmldata/modern-in.xml
index f7104efa017a40530a85c0f3af0e1467a68c6373..2125b899f4ff5c69f6dbd05c7b4cb4f394901d7f 100644 (file)
--- a/tests/qemustatusxml2xmldata/modern-in.xml
+++ b/tests/qemustatusxml2xmldata/modern-in.xml
@@ -1,6 +1,6 @@
 <domstatus state='running' reason='booted' pid='195139'>
   <taint flag='high-privileges'/>
-  <monitor path='/var/lib/libvirt/qemu/domain-1-upstream/monitor.sock' json='1' type='unix'/>
+  <monitor path='/var/lib/libvirt/qemu/domain-1-upstream/monitor.sock' type='unix'/>
   <namespaces>
     <mount/>
   </namespaces>

diff --git a/tests/qemustatusxml2xmldata/vcpus-multi-in.xml b/tests/qemustatusxml2xmldata/vcpus-multi-in.xml
index c99046ce8d6524c74fab1da6766d34d600033602..b8ec650714605784d29aac2b2c344066ce43aa8d 100644 (file)
--- a/tests/qemustatusxml2xmldata/vcpus-multi-in.xml
+++ b/tests/qemustatusxml2xmldata/vcpus-multi-in.xml
@@ -1,6 +1,6 @@
 <domstatus state='running' reason='booted' pid='3803518'>
   <taint flag='high-privileges'/>
-  <monitor path='/var/lib/libvirt/qemu/test.monitor' json='1' type='unix'/>
+  <monitor path='/var/lib/libvirt/qemu/test.monitor' type='unix'/>
   <vcpus>
     <vcpu id='0' pid='3803519'/>
     <vcpu id='1' pid='3803520'/>