External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-27 22:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Ján Tomko 2019-06-14 21:14:48 +02:00
parent ec9f1cd569
commit 173a191cfe
9 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/qemu/qemu_domain.c
View File

@ -2474,7 +2474,6 @@ qemuDomainObjPrivateXMLFormat(virBufferPtr buf,
} }
virBufferEscapeString(buf, "<monitor path='%s'", monitorpath); virBufferEscapeString(buf, "<monitor path='%s'", monitorpath);
virBufferAddLit(buf, " json='1'");
virBufferAsprintf(buf, " type='%s'/>\n", virBufferAsprintf(buf, " type='%s'/>\n",
virDomainChrTypeToString(priv->monConfig->type)); virDomainChrTypeToString(priv->monConfig->type));
} }

2
tests/qemustatusxml2xmldata/blockjob-mirror-in.xml
View File

@ -1,6 +1,6 @@
<domstatus state='running' reason='booted' pid='3803518'> <domstatus state='running' reason='booted' pid='3803518'>
<taint flag='high-privileges'/> <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> <vcpus>
<vcpu id='0' pid='3803519'/> <vcpu id='0' pid='3803519'/>
</vcpus> </vcpus>

2
tests/qemustatusxml2xmldata/disk-secinfo-upgrade-out.xml
View File

@ -1,5 +1,5 @@
<domstatus state='running' reason='booted' pid='195139'> <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> <namespaces>
<mount/> <mount/>
</namespaces> </namespaces>

2
tests/qemustatusxml2xmldata/migration-in-params-in.xml
View File

@ -1,7 +1,7 @@
<domstatus state='paused' reason='migration' pid='2296'> <domstatus state='paused' reason='migration' pid='2296'>
<taint flag='high-privileges'/> <taint flag='high-privileges'/>
<taint flag='host-cpu'/> <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> <namespaces>
<mount/> <mount/>
</namespaces> </namespaces>

2
tests/qemustatusxml2xmldata/migration-out-nbd-out.xml
View File

@ -1,6 +1,6 @@
<domstatus state='running' reason='booted' pid='15433'> <domstatus state='running' reason='booted' pid='15433'>
<taint flag='high-privileges'/> <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> <vcpus>
<vcpu id='0' pid='15449'/> <vcpu id='0' pid='15449'/>
<vcpu id='1' pid='15450'/> <vcpu id='1' pid='15450'/>

2
tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml
View File

@ -1,6 +1,6 @@
<domstatus state='running' reason='booted' pid='68472'> <domstatus state='running' reason='booted' pid='68472'>
<taint flag='high-privileges'/> <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> <namespaces>
<mount/> <mount/>
</namespaces> </namespaces>

2
tests/qemustatusxml2xmldata/migration-out-params-in.xml
View File

@ -1,7 +1,7 @@
<domstatus state='paused' reason='migration' pid='21586'> <domstatus state='paused' reason='migration' pid='21586'>
<taint flag='high-privileges'/> <taint flag='high-privileges'/>
<taint flag='host-cpu'/> <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> <namespaces>
<mount/> <mount/>
</namespaces> </namespaces>

2
tests/qemustatusxml2xmldata/modern-in.xml
View File

@ -1,6 +1,6 @@
<domstatus state='running' reason='booted' pid='195139'> <domstatus state='running' reason='booted' pid='195139'>
<taint flag='high-privileges'/> <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> <namespaces>
<mount/> <mount/>
</namespaces> </namespaces>

2
tests/qemustatusxml2xmldata/vcpus-multi-in.xml
View File

@ -1,6 +1,6 @@
<domstatus state='running' reason='booted' pid='3803518'> <domstatus state='running' reason='booted' pid='3803518'>
<taint flag='high-privileges'/> <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> <vcpus>
<vcpu id='0' pid='3803519'/> <vcpu id='0' pid='3803519'/>
<vcpu id='1' pid='3803520'/> <vcpu id='1' pid='3803520'/>