openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

test: Update qemumonitorjsontest to add halted output 

Print out the halted property in the test output.

Signed-off-by: Viktor Mihajlovski <mihajlov@linux.vnet.ibm.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
Viktor Mihajlovski 2018-04-12 11:14:30 -04:00 committed by John Ferlan
parent 5cff7b7db7
commit 56665e9984
4 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hotplug-4.data
View File

@ -52,41 +52,49 @@
alias='vcpu0' alias='vcpu0'
qom_path='/machine/peripheral/vcpu0' qom_path='/machine/peripheral/vcpu0'
topology: core='8' vcpus='8' topology: core='8' vcpus='8'
halted
[vcpu libvirt-id='9'] [vcpu libvirt-id='9']
online=yes online=yes
hotpluggable=yes hotpluggable=yes
thread-id='23171' thread-id='23171'
query-cpus-id='17' query-cpus-id='17'
halted
[vcpu libvirt-id='10'] [vcpu libvirt-id='10']
online=yes online=yes
hotpluggable=yes hotpluggable=yes
thread-id='23172' thread-id='23172'
query-cpus-id='18' query-cpus-id='18'
halted
[vcpu libvirt-id='11'] [vcpu libvirt-id='11']
online=yes online=yes
hotpluggable=yes hotpluggable=yes
thread-id='23173' thread-id='23173'
query-cpus-id='19' query-cpus-id='19'
halted
[vcpu libvirt-id='12'] [vcpu libvirt-id='12']
online=yes online=yes
hotpluggable=yes hotpluggable=yes
thread-id='23174' thread-id='23174'
query-cpus-id='20' query-cpus-id='20'
halted
[vcpu libvirt-id='13'] [vcpu libvirt-id='13']
online=yes online=yes
hotpluggable=yes hotpluggable=yes
thread-id='23175' thread-id='23175'
query-cpus-id='21' query-cpus-id='21'
halted
[vcpu libvirt-id='14'] [vcpu libvirt-id='14']
online=yes online=yes
hotpluggable=yes hotpluggable=yes
thread-id='23176' thread-id='23176'
query-cpus-id='22' query-cpus-id='22'
halted
[vcpu libvirt-id='15'] [vcpu libvirt-id='15']
online=yes online=yes
hotpluggable=yes hotpluggable=yes
thread-id='23177' thread-id='23177'
query-cpus-id='23' query-cpus-id='23'
halted
[vcpu libvirt-id='16'] [vcpu libvirt-id='16']
online=yes online=yes
hotpluggable=yes hotpluggable=yes

5
tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-basic-pluggable.data
View File

@ -7,6 +7,7 @@
type='qemu64-x86_64-cpu' type='qemu64-x86_64-cpu'
qom_path='/machine/unattached/device[0]' qom_path='/machine/unattached/device[0]'
topology: socket='0' core='0' thread='0' vcpus='1' topology: socket='0' core='0' thread='0' vcpus='1'
halted
[vcpu libvirt-id='1'] [vcpu libvirt-id='1']
online=yes online=yes
hotpluggable=no hotpluggable=no
@ -16,6 +17,7 @@
type='qemu64-x86_64-cpu' type='qemu64-x86_64-cpu'
qom_path='/machine/unattached/device[2]' qom_path='/machine/unattached/device[2]'
topology: socket='0' core='0' thread='1' vcpus='1' topology: socket='0' core='0' thread='1' vcpus='1'
halted
[vcpu libvirt-id='2'] [vcpu libvirt-id='2']
online=yes online=yes
hotpluggable=no hotpluggable=no
@ -25,6 +27,7 @@
type='qemu64-x86_64-cpu' type='qemu64-x86_64-cpu'
qom_path='/machine/unattached/device[3]' qom_path='/machine/unattached/device[3]'
topology: socket='0' core='1' thread='0' vcpus='1' topology: socket='0' core='1' thread='0' vcpus='1'
halted
[vcpu libvirt-id='3'] [vcpu libvirt-id='3']
online=yes online=yes
hotpluggable=no hotpluggable=no
@ -34,6 +37,7 @@
type='qemu64-x86_64-cpu' type='qemu64-x86_64-cpu'
qom_path='/machine/unattached/device[4]' qom_path='/machine/unattached/device[4]'
topology: socket='0' core='1' thread='1' vcpus='1' topology: socket='0' core='1' thread='1' vcpus='1'
halted
[vcpu libvirt-id='4'] [vcpu libvirt-id='4']
online=yes online=yes
hotpluggable=no hotpluggable=no
@ -43,6 +47,7 @@
type='qemu64-x86_64-cpu' type='qemu64-x86_64-cpu'
qom_path='/machine/unattached/device[5]' qom_path='/machine/unattached/device[5]'
topology: socket='1' core='0' thread='0' vcpus='1' topology: socket='1' core='0' thread='0' vcpus='1'
halted
[vcpu libvirt-id='5'] [vcpu libvirt-id='5']
online=no online=no
hotpluggable=yes hotpluggable=yes

2
tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-node-full.data
View File

@ -7,6 +7,7 @@
type='Broadwell-x86_64-cpu' type='Broadwell-x86_64-cpu'
qom_path='/machine/unattached/device[0]' qom_path='/machine/unattached/device[0]'
topology: socket='0' core='0' thread='0' node='0' vcpus='1' topology: socket='0' core='0' thread='0' node='0' vcpus='1'
halted
[vcpu libvirt-id='1'] [vcpu libvirt-id='1']
online=yes online=yes
hotpluggable=no hotpluggable=no
@ -16,6 +17,7 @@
type='Broadwell-x86_64-cpu' type='Broadwell-x86_64-cpu'
qom_path='/machine/unattached/device[2]' qom_path='/machine/unattached/device[2]'
topology: socket='0' core='0' thread='1' node='1' vcpus='1' topology: socket='0' core='0' thread='1' node='1' vcpus='1'
halted
[vcpu libvirt-id='2'] [vcpu libvirt-id='2']
online=no online=no
hotpluggable=yes hotpluggable=yes

3
tests/qemumonitorjsontest.c
View File

@ -2585,6 +2585,9 @@ testQemuMonitorCPUInfoFormat(qemuMonitorCPUInfoPtr vcpus,
virBufferAddLit(&buf, "\n"); virBufferAddLit(&buf, "\n");
} }
if (vcpu->halted)
virBufferAddLit(&buf, "halted\n");
virBufferAdjustIndent(&buf, -4); virBufferAdjustIndent(&buf, -4);
} }