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

tests: qemumonitorjson: Rename 'qemu-id' to 'enable-id' in cpu info test

Browse Source 
The field is named 'enable_id' in other structures and a patch recently
added 'qemu_id' which has different semantics. To avoid confusion in the
tests rename the field.
This commit is contained in:
Peter Krempa 2016-11-22 10:21:46 +01:00
parent 0b4c3bd307
commit 62d57d1b23
8 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-basic.data
View File

@ -2,7 +2,7 @@
online=yes online=yes
hotpluggable=no hotpluggable=no
thread-id='21925' thread-id='21925'
qemu-id='1' enable-id='1'
type='host-spapr-cpu-core' type='host-spapr-cpu-core'
qom_path='/machine/unattached/device[1]' qom_path='/machine/unattached/device[1]'
topology: core='0' vcpus='8' topology: core='0' vcpus='8'

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

@ -2,7 +2,7 @@
online=yes online=yes
hotpluggable=no hotpluggable=no
thread-id='21925' thread-id='21925'
qemu-id='1' enable-id='1'
type='host-spapr-cpu-core' type='host-spapr-cpu-core'
qom_path='/machine/unattached/device[1]' qom_path='/machine/unattached/device[1]'
topology: core='0' vcpus='8' topology: core='0' vcpus='8'
@ -38,7 +38,7 @@
online=yes online=yes
hotpluggable=yes hotpluggable=yes
thread-id='22131' thread-id='22131'
qemu-id='2' enable-id='2'
type='host-spapr-cpu-core' type='host-spapr-cpu-core'
alias='vcpu0' alias='vcpu0'
qom_path='/machine/peripheral/vcpu0' qom_path='/machine/peripheral/vcpu0'

6
tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hotplug-2.data
View File

@ -2,7 +2,7 @@
online=yes online=yes
hotpluggable=no hotpluggable=no
thread-id='21925' thread-id='21925'
qemu-id='1' enable-id='1'
type='host-spapr-cpu-core' type='host-spapr-cpu-core'
qom_path='/machine/unattached/device[1]' qom_path='/machine/unattached/device[1]'
topology: core='0' vcpus='8' topology: core='0' vcpus='8'
@ -38,7 +38,7 @@
online=yes online=yes
hotpluggable=yes hotpluggable=yes
thread-id='22131' thread-id='22131'
qemu-id='2' enable-id='2'
type='host-spapr-cpu-core' type='host-spapr-cpu-core'
alias='vcpu0' alias='vcpu0'
qom_path='/machine/peripheral/vcpu0' qom_path='/machine/peripheral/vcpu0'
@ -75,7 +75,7 @@
online=yes online=yes
hotpluggable=yes hotpluggable=yes
thread-id='22223' thread-id='22223'
qemu-id='3' enable-id='3'
type='host-spapr-cpu-core' type='host-spapr-cpu-core'
alias='vcpu1' alias='vcpu1'
qom_path='/machine/peripheral/vcpu1' qom_path='/machine/peripheral/vcpu1'

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

@ -2,7 +2,7 @@
online=yes online=yes
hotpluggable=no hotpluggable=no
thread-id='21925' thread-id='21925'
qemu-id='1' enable-id='1'
type='host-spapr-cpu-core' type='host-spapr-cpu-core'
qom_path='/machine/unattached/device[1]' qom_path='/machine/unattached/device[1]'
topology: core='0' vcpus='8' topology: core='0' vcpus='8'
@ -38,7 +38,7 @@
online=yes online=yes
hotpluggable=yes hotpluggable=yes
thread-id='23170' thread-id='23170'
qemu-id='3' enable-id='3'
type='host-spapr-cpu-core' type='host-spapr-cpu-core'
alias='vcpu0' alias='vcpu0'
qom_path='/machine/peripheral/vcpu0' qom_path='/machine/peripheral/vcpu0'
@ -75,7 +75,7 @@
online=yes online=yes
hotpluggable=yes hotpluggable=yes
thread-id='22741' thread-id='22741'
qemu-id='2' enable-id='2'
type='host-spapr-cpu-core' type='host-spapr-cpu-core'
alias='vcpu1' alias='vcpu1'
qom_path='/machine/peripheral/vcpu1' qom_path='/machine/peripheral/vcpu1'

16
tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-no-threads.data
View File

@ -2,7 +2,7 @@
online=yes online=yes
hotpluggable=no hotpluggable=no
thread-id='35232' thread-id='35232'
qemu-id='1' enable-id='1'
type='host-spapr-cpu-core' type='host-spapr-cpu-core'
qom_path='/machine/unattached/device[1]' qom_path='/machine/unattached/device[1]'
topology: core='0' vcpus='1' topology: core='0' vcpus='1'
@ -10,7 +10,7 @@
online=yes online=yes
hotpluggable=no hotpluggable=no
thread-id='35233' thread-id='35233'
qemu-id='2' enable-id='2'
type='host-spapr-cpu-core' type='host-spapr-cpu-core'
qom_path='/machine/unattached/device[2]' qom_path='/machine/unattached/device[2]'
topology: core='8' vcpus='1' topology: core='8' vcpus='1'
@ -18,7 +18,7 @@
online=yes online=yes
hotpluggable=no hotpluggable=no
thread-id='35234' thread-id='35234'
qemu-id='3' enable-id='3'
type='host-spapr-cpu-core' type='host-spapr-cpu-core'
qom_path='/machine/unattached/device[3]' qom_path='/machine/unattached/device[3]'
topology: core='16' vcpus='1' topology: core='16' vcpus='1'
@ -26,7 +26,7 @@
online=yes online=yes
hotpluggable=no hotpluggable=no
thread-id='35235' thread-id='35235'
qemu-id='4' enable-id='4'
type='host-spapr-cpu-core' type='host-spapr-cpu-core'
qom_path='/machine/unattached/device[4]' qom_path='/machine/unattached/device[4]'
topology: core='24' vcpus='1' topology: core='24' vcpus='1'
@ -34,7 +34,7 @@
online=yes online=yes
hotpluggable=no hotpluggable=no
thread-id='35236' thread-id='35236'
qemu-id='5' enable-id='5'
type='host-spapr-cpu-core' type='host-spapr-cpu-core'
qom_path='/machine/unattached/device[5]' qom_path='/machine/unattached/device[5]'
topology: core='32' vcpus='1' topology: core='32' vcpus='1'
@ -42,7 +42,7 @@
online=yes online=yes
hotpluggable=no hotpluggable=no
thread-id='35237' thread-id='35237'
qemu-id='6' enable-id='6'
type='host-spapr-cpu-core' type='host-spapr-cpu-core'
qom_path='/machine/unattached/device[6]' qom_path='/machine/unattached/device[6]'
topology: core='40' vcpus='1' topology: core='40' vcpus='1'
@ -50,7 +50,7 @@
online=yes online=yes
hotpluggable=no hotpluggable=no
thread-id='35238' thread-id='35238'
qemu-id='7' enable-id='7'
type='host-spapr-cpu-core' type='host-spapr-cpu-core'
qom_path='/machine/unattached/device[7]' qom_path='/machine/unattached/device[7]'
topology: core='48' vcpus='1' topology: core='48' vcpus='1'
@ -58,7 +58,7 @@
online=yes online=yes
hotpluggable=no hotpluggable=no
thread-id='35239' thread-id='35239'
qemu-id='8' enable-id='8'
type='host-spapr-cpu-core' type='host-spapr-cpu-core'
qom_path='/machine/unattached/device[8]' qom_path='/machine/unattached/device[8]'
topology: core='56' vcpus='1' topology: core='56' vcpus='1'

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

@ -2,7 +2,7 @@
online=yes online=yes
hotpluggable=no hotpluggable=no
thread-id='518291' thread-id='518291'
qemu-id='1' enable-id='1'
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'
@ -10,7 +10,7 @@
online=yes online=yes
hotpluggable=no hotpluggable=no
thread-id='518292' thread-id='518292'
qemu-id='2' enable-id='2'
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'
@ -18,7 +18,7 @@
online=yes online=yes
hotpluggable=no hotpluggable=no
thread-id='518294' thread-id='518294'
qemu-id='3' enable-id='3'
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'
@ -26,7 +26,7 @@
online=yes online=yes
hotpluggable=no hotpluggable=no
thread-id='518295' thread-id='518295'
qemu-id='4' enable-id='4'
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'
@ -34,7 +34,7 @@
online=yes online=yes
hotpluggable=no hotpluggable=no
thread-id='518296' thread-id='518296'
qemu-id='5' enable-id='5'
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'

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

@ -2,7 +2,7 @@
online=yes online=yes
hotpluggable=no hotpluggable=no
thread-id='895040' thread-id='895040'
qemu-id='1' enable-id='1'
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' vcpus='1' topology: socket='0' core='0' thread='0' vcpus='1'
@ -10,7 +10,7 @@
online=yes online=yes
hotpluggable=yes hotpluggable=yes
thread-id='895056' thread-id='895056'
qemu-id='2' enable-id='2'
type='Broadwell-x86_64-cpu' type='Broadwell-x86_64-cpu'
alias='vcpu1' alias='vcpu1'
qom_path='/machine/peripheral/vcpu1' qom_path='/machine/peripheral/vcpu1'
@ -19,7 +19,7 @@
online=yes online=yes
hotpluggable=yes hotpluggable=yes
thread-id='895057' thread-id='895057'
qemu-id='3' enable-id='3'
type='Broadwell-x86_64-cpu' type='Broadwell-x86_64-cpu'
alias='vcpu2' alias='vcpu2'
qom_path='/machine/peripheral/vcpu2' qom_path='/machine/peripheral/vcpu2'
@ -28,7 +28,7 @@
online=yes online=yes
hotpluggable=yes hotpluggable=yes
thread-id='895058' thread-id='895058'
qemu-id='4' enable-id='4'
type='Broadwell-x86_64-cpu' type='Broadwell-x86_64-cpu'
alias='vcpu3' alias='vcpu3'
qom_path='/machine/peripheral/vcpu3' qom_path='/machine/peripheral/vcpu3'
@ -37,7 +37,7 @@
online=yes online=yes
hotpluggable=yes hotpluggable=yes
thread-id='895059' thread-id='895059'
qemu-id='5' enable-id='5'
type='Broadwell-x86_64-cpu' type='Broadwell-x86_64-cpu'
alias='vcpu4' alias='vcpu4'
qom_path='/machine/peripheral/vcpu4' qom_path='/machine/peripheral/vcpu4'
@ -46,7 +46,7 @@
online=yes online=yes
hotpluggable=yes hotpluggable=yes
thread-id='895060' thread-id='895060'
qemu-id='6' enable-id='6'
type='Broadwell-x86_64-cpu' type='Broadwell-x86_64-cpu'
alias='vcpu5' alias='vcpu5'
qom_path='/machine/peripheral/vcpu5' qom_path='/machine/peripheral/vcpu5'
@ -55,7 +55,7 @@
online=yes online=yes
hotpluggable=yes hotpluggable=yes
thread-id='895061' thread-id='895061'
qemu-id='7' enable-id='7'
type='Broadwell-x86_64-cpu' type='Broadwell-x86_64-cpu'
alias='vcpu6' alias='vcpu6'
qom_path='/machine/peripheral/vcpu6' qom_path='/machine/peripheral/vcpu6'
@ -64,7 +64,7 @@
online=yes online=yes
hotpluggable=yes hotpluggable=yes
thread-id='895062' thread-id='895062'
qemu-id='8' enable-id='8'
type='Broadwell-x86_64-cpu' type='Broadwell-x86_64-cpu'
alias='vcpu7' alias='vcpu7'
qom_path='/machine/peripheral/vcpu7' qom_path='/machine/peripheral/vcpu7'
@ -73,7 +73,7 @@
online=yes online=yes
hotpluggable=yes hotpluggable=yes
thread-id='895063' thread-id='895063'
qemu-id='9' enable-id='9'
type='Broadwell-x86_64-cpu' type='Broadwell-x86_64-cpu'
alias='vcpu8' alias='vcpu8'
qom_path='/machine/peripheral/vcpu8' qom_path='/machine/peripheral/vcpu8'
@ -82,7 +82,7 @@
online=yes online=yes
hotpluggable=yes hotpluggable=yes
thread-id='895064' thread-id='895064'
qemu-id='10' enable-id='10'
type='Broadwell-x86_64-cpu' type='Broadwell-x86_64-cpu'
alias='vcpu9' alias='vcpu9'
qom_path='/machine/peripheral/vcpu9' qom_path='/machine/peripheral/vcpu9'
@ -91,7 +91,7 @@
online=yes online=yes
hotpluggable=yes hotpluggable=yes
thread-id='895065' thread-id='895065'
qemu-id='11' enable-id='11'
type='Broadwell-x86_64-cpu' type='Broadwell-x86_64-cpu'
alias='vcpu10' alias='vcpu10'
qom_path='/machine/peripheral/vcpu10' qom_path='/machine/peripheral/vcpu10'

2
tests/qemumonitorjsontest.c
View File

@ -2489,7 +2489,7 @@ testQemuMonitorCPUInfoFormat(qemuMonitorCPUInfoPtr vcpus,
(unsigned long long) vcpu->tid); (unsigned long long) vcpu->tid);
if (vcpu->id != 0) if (vcpu->id != 0)
virBufferAsprintf(&buf, "qemu-id='%d'\n", vcpu->id); virBufferAsprintf(&buf, "enable-id='%d'\n", vcpu->id);
if (vcpu->type) if (vcpu->type)
virBufferAsprintf(&buf, "type='%s'\n", vcpu->type); virBufferAsprintf(&buf, "type='%s'\n", vcpu->type);