3:51 a.m.
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.
---
.../qemumonitorjson-cpuinfo-ppc64-basic.data | 2 +-
.../qemumonitorjson-cpuinfo-ppc64-hotplug-1.data | 4 ++--
.../qemumonitorjson-cpuinfo-ppc64-hotplug-2.data | 6 +++---
.../qemumonitorjson-cpuinfo-ppc64-hotplug-4.data | 6 +++---
.../qemumonitorjson-cpuinfo-ppc64-no-threads.data | 16 ++++++++--------
...emumonitorjson-cpuinfo-x86-basic-pluggable.data | 10 +++++-----
.../qemumonitorjson-cpuinfo-x86-full.data | 22 +++++++++++-----------
tests/qemumonitorjsontest.c | 2 +-
8 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-basic.data
b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-basic.data
index ae7c2f4..9969648 100644
--- a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-basic.data
+++ b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-basic.data
@@ -2,7 +2,7 @@
online=yes
hotpluggable=no
thread-id='21925'
- qemu-id='1'
+ enable-id='1'
type='host-spapr-cpu-core'
qom_path='/machine/unattached/device[1]'
topology: core='0' vcpus='8'
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hotplug-1.data
b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hotplug-1.data
index 5c0a6af..643f6ec 100644
--- a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hotplug-1.data
+++ b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hotplug-1.data
@@ -2,7 +2,7 @@
online=yes
hotpluggable=no
thread-id='21925'
- qemu-id='1'
+ enable-id='1'
type='host-spapr-cpu-core'
qom_path='/machine/unattached/device[1]'
topology: core='0' vcpus='8'
@@ -38,7 +38,7 @@
online=yes
hotpluggable=yes
thread-id='22131'
- qemu-id='2'
+ enable-id='2'
type='host-spapr-cpu-core'
alias='vcpu0'
qom_path='/machine/peripheral/vcpu0'
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hotplug-2.data
b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hotplug-2.data
index ba4044e..43780ee 100644
--- a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hotplug-2.data
+++ b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hotplug-2.data
@@ -2,7 +2,7 @@
online=yes
hotpluggable=no
thread-id='21925'
- qemu-id='1'
+ enable-id='1'
type='host-spapr-cpu-core'
qom_path='/machine/unattached/device[1]'
topology: core='0' vcpus='8'
@@ -38,7 +38,7 @@
online=yes
hotpluggable=yes
thread-id='22131'
- qemu-id='2'
+ enable-id='2'
type='host-spapr-cpu-core'
alias='vcpu0'
qom_path='/machine/peripheral/vcpu0'
@@ -75,7 +75,7 @@
online=yes
hotpluggable=yes
thread-id='22223'
- qemu-id='3'
+ enable-id='3'
type='host-spapr-cpu-core'
alias='vcpu1'
qom_path='/machine/peripheral/vcpu1'
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hotplug-4.data
b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hotplug-4.data
index d2c56ef..dfa2d3f 100644
--- a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hotplug-4.data
+++ b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hotplug-4.data
@@ -2,7 +2,7 @@
online=yes
hotpluggable=no
thread-id='21925'
- qemu-id='1'
+ enable-id='1'
type='host-spapr-cpu-core'
qom_path='/machine/unattached/device[1]'
topology: core='0' vcpus='8'
@@ -38,7 +38,7 @@
online=yes
hotpluggable=yes
thread-id='23170'
- qemu-id='3'
+ enable-id='3'
type='host-spapr-cpu-core'
alias='vcpu0'
qom_path='/machine/peripheral/vcpu0'
@@ -75,7 +75,7 @@
online=yes
hotpluggable=yes
thread-id='22741'
- qemu-id='2'
+ enable-id='2'
type='host-spapr-cpu-core'
alias='vcpu1'
qom_path='/machine/peripheral/vcpu1'
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-no-threads.data
b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-no-threads.data
index c2f541b..2519ad3 100644
--- a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-no-threads.data
+++ b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-no-threads.data
@@ -2,7 +2,7 @@
online=yes
hotpluggable=no
thread-id='35232'
- qemu-id='1'
+ enable-id='1'
type='host-spapr-cpu-core'
qom_path='/machine/unattached/device[1]'
topology: core='0' vcpus='1'
@@ -10,7 +10,7 @@
online=yes
hotpluggable=no
thread-id='35233'
- qemu-id='2'
+ enable-id='2'
type='host-spapr-cpu-core'
qom_path='/machine/unattached/device[2]'
topology: core='8' vcpus='1'
@@ -18,7 +18,7 @@
online=yes
hotpluggable=no
thread-id='35234'
- qemu-id='3'
+ enable-id='3'
type='host-spapr-cpu-core'
qom_path='/machine/unattached/device[3]'
topology: core='16' vcpus='1'
@@ -26,7 +26,7 @@
online=yes
hotpluggable=no
thread-id='35235'
- qemu-id='4'
+ enable-id='4'
type='host-spapr-cpu-core'
qom_path='/machine/unattached/device[4]'
topology: core='24' vcpus='1'
@@ -34,7 +34,7 @@
online=yes
hotpluggable=no
thread-id='35236'
- qemu-id='5'
+ enable-id='5'
type='host-spapr-cpu-core'
qom_path='/machine/unattached/device[5]'
topology: core='32' vcpus='1'
@@ -42,7 +42,7 @@
online=yes
hotpluggable=no
thread-id='35237'
- qemu-id='6'
+ enable-id='6'
type='host-spapr-cpu-core'
qom_path='/machine/unattached/device[6]'
topology: core='40' vcpus='1'
@@ -50,7 +50,7 @@
online=yes
hotpluggable=no
thread-id='35238'
- qemu-id='7'
+ enable-id='7'
type='host-spapr-cpu-core'
qom_path='/machine/unattached/device[7]'
topology: core='48' vcpus='1'
@@ -58,7 +58,7 @@
online=yes
hotpluggable=no
thread-id='35239'
- qemu-id='8'
+ enable-id='8'
type='host-spapr-cpu-core'
qom_path='/machine/unattached/device[8]'
topology: core='56' vcpus='1'
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-basic-pluggable.data
b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-basic-pluggable.data
index 67dfc01..1fea077 100644
--- a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-basic-pluggable.data
+++ b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-basic-pluggable.data
@@ -2,7 +2,7 @@
online=yes
hotpluggable=no
thread-id='518291'
- qemu-id='1'
+ enable-id='1'
type='qemu64-x86_64-cpu'
qom_path='/machine/unattached/device[0]'
topology: socket='0' core='0' thread='0' vcpus='1'
@@ -10,7 +10,7 @@
online=yes
hotpluggable=no
thread-id='518292'
- qemu-id='2'
+ enable-id='2'
type='qemu64-x86_64-cpu'
qom_path='/machine/unattached/device[2]'
topology: socket='0' core='0' thread='1' vcpus='1'
@@ -18,7 +18,7 @@
online=yes
hotpluggable=no
thread-id='518294'
- qemu-id='3'
+ enable-id='3'
type='qemu64-x86_64-cpu'
qom_path='/machine/unattached/device[3]'
topology: socket='0' core='1' thread='0' vcpus='1'
@@ -26,7 +26,7 @@
online=yes
hotpluggable=no
thread-id='518295'
- qemu-id='4'
+ enable-id='4'
type='qemu64-x86_64-cpu'
qom_path='/machine/unattached/device[4]'
topology: socket='0' core='1' thread='1' vcpus='1'
@@ -34,7 +34,7 @@
online=yes
hotpluggable=no
thread-id='518296'
- qemu-id='5'
+ enable-id='5'
type='qemu64-x86_64-cpu'
qom_path='/machine/unattached/device[5]'
topology: socket='1' core='0' thread='0' vcpus='1'
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full.data
b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full.data
index dba3745..c827892 100644
--- a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full.data
+++ b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full.data
@@ -2,7 +2,7 @@
online=yes
hotpluggable=no
thread-id='895040'
- qemu-id='1'
+ enable-id='1'
type='Broadwell-x86_64-cpu'
qom_path='/machine/unattached/device[0]'
topology: socket='0' core='0' thread='0' vcpus='1'
@@ -10,7 +10,7 @@
online=yes
hotpluggable=yes
thread-id='895056'
- qemu-id='2'
+ enable-id='2'
type='Broadwell-x86_64-cpu'
alias='vcpu1'
qom_path='/machine/peripheral/vcpu1'
@@ -19,7 +19,7 @@
online=yes
hotpluggable=yes
thread-id='895057'
- qemu-id='3'
+ enable-id='3'
type='Broadwell-x86_64-cpu'
alias='vcpu2'
qom_path='/machine/peripheral/vcpu2'
@@ -28,7 +28,7 @@
online=yes
hotpluggable=yes
thread-id='895058'
- qemu-id='4'
+ enable-id='4'
type='Broadwell-x86_64-cpu'
alias='vcpu3'
qom_path='/machine/peripheral/vcpu3'
@@ -37,7 +37,7 @@
online=yes
hotpluggable=yes
thread-id='895059'
- qemu-id='5'
+ enable-id='5'
type='Broadwell-x86_64-cpu'
alias='vcpu4'
qom_path='/machine/peripheral/vcpu4'
@@ -46,7 +46,7 @@
online=yes
hotpluggable=yes
thread-id='895060'
- qemu-id='6'
+ enable-id='6'
type='Broadwell-x86_64-cpu'
alias='vcpu5'
qom_path='/machine/peripheral/vcpu5'
@@ -55,7 +55,7 @@
online=yes
hotpluggable=yes
thread-id='895061'
- qemu-id='7'
+ enable-id='7'
type='Broadwell-x86_64-cpu'
alias='vcpu6'
qom_path='/machine/peripheral/vcpu6'
@@ -64,7 +64,7 @@
online=yes
hotpluggable=yes
thread-id='895062'
- qemu-id='8'
+ enable-id='8'
type='Broadwell-x86_64-cpu'
alias='vcpu7'
qom_path='/machine/peripheral/vcpu7'
@@ -73,7 +73,7 @@
online=yes
hotpluggable=yes
thread-id='895063'
- qemu-id='9'
+ enable-id='9'
type='Broadwell-x86_64-cpu'
alias='vcpu8'
qom_path='/machine/peripheral/vcpu8'
@@ -82,7 +82,7 @@
online=yes
hotpluggable=yes
thread-id='895064'
- qemu-id='10'
+ enable-id='10'
type='Broadwell-x86_64-cpu'
alias='vcpu9'
qom_path='/machine/peripheral/vcpu9'
@@ -91,7 +91,7 @@
online=yes
hotpluggable=yes
thread-id='895065'
- qemu-id='11'
+ enable-id='11'
type='Broadwell-x86_64-cpu'
alias='vcpu10'
qom_path='/machine/peripheral/vcpu10'
diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index ed4190b..a60f0a0 100644
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -2489,7 +2489,7 @@ testQemuMonitorCPUInfoFormat(qemuMonitorCPUInfoPtr vcpus,
(unsigned long long) vcpu->tid);
if (vcpu->id != 0)
- virBufferAsprintf(&buf, "qemu-id='%d'\n",
vcpu->id);
+ virBufferAsprintf(&buf, "enable-id='%d'\n",
vcpu->id);
if (vcpu->type)
virBufferAsprintf(&buf, "type='%s'\n", vcpu->type);
--
2.10.2