[libvirt] [PATCH 04/10] 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(a)redhat.com&gt; --- src/qemu/qemu_domain.c | 1 - tests/qemustatusxml2xmldata/blockjob-mirror-in.xml | 2 +- tests/qemustatusxml2xmldata/disk-secinfo-upgrade-out.xml | 2 +- tests/qemustatusxml2xmldata/migration-in-params-in.xml | 2 +- tests/qemustatusxml2xmldata/migration-out-nbd-out.xml | 2 +- tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml | 2 +- tests/qemustatusxml2xmldata/migration-out-params-in.xml | 2 +- tests/qemustatusxml2xmldata/modern-in.xml | 2 +- tests/qemustatusxml2xmldata/vcpus-multi-in.xml | 2 +- 9 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 0b88b1b98b..61778481f3 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2483,7 +2483,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 df23ac00aa..0fba3b69e7 100644 --- 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 7a26e93aa4..3d5e8f1438 100644 --- 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 03f18b4f3d..80cc4b4666 100644 --- 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 315d8e4c1a..455c30be85 100644 --- 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 869f37d488..409e97a918 100644 --- 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 ae2064830a..4a660281d2 100644 --- 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 08f7f40761..6ce0f96f54 100644 --- 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 c99046ce8d..b8ec650714 100644 --- 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'/> -- 2.20.1