[PATCH v2 3/7] tests: convert ppc64 tests to query-cpus-fast

All supported versions of QEMU include the query-cpus-fast QMP command. In preparation for dropping support for the old "query-cpus" commands, convert the JSON output for PPC tests to the new format, and drop the "halted" field from the expected output as it is not available anymore. The CPU properties were obtained from the query-hotpluggable-cpus output in tests/qemumonitorjsondata. CPU, thread_id, and qom_path are renamed respectively to cpu-index, qom-path and thread-id, while nip and halted are removed. Signed-off-by: Paolo Bonzini <pbonzini(a)redhat.com&gt; --- ...umonitorjson-cpuinfo-ppc64-basic-cpus.json | 64 ++--- ...itorjson-cpuinfo-ppc64-hotplug-1-cpus.json | 176 ++++++------ ...itorjson-cpuinfo-ppc64-hotplug-2-cpus.json | 264 ++++++++++-------- ...itorjson-cpuinfo-ppc64-hotplug-4-cpus.json | 264 ++++++++++-------- ...mumonitorjson-cpuinfo-ppc64-hotplug-4.data | 8 - ...torjson-cpuinfo-ppc64-no-threads-cpus.json | 88 +++--- tests/qemumonitorjsontest.c | 10 +- 7 files changed, 461 insertions(+), 413 deletions(-) diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-basic-cpus.json b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-basic-cpus.json index 27a3d8b89f..d1d3406958 100644 --- a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-basic-cpus.json +++ b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-basic-cpus.json @@ -3,74 +3,58 @@ { "arch": "ppc", "current": true, - "CPU": 0, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[0]", - "halted": false, - "thread_id": 21925 + "cpu-index": 0, + "qom-path": "/machine/unattached/device[1]/thread[0]", + "thread-id": 21925 }, { "arch": "ppc", "current": false, - "CPU": 1, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[1]", - "halted": false, - "thread_id": 21926 + "cpu-index": 1, + "qom-path": "/machine/unattached/device[1]/thread[1]", + "thread-id": 21926 }, { "arch": "ppc", "current": false, - "CPU": 2, - "nip": -4611686018422360608, - "qom_path": "/machine/unattached/device[1]/thread[2]", - "halted": false, - "thread_id": 21927 + "cpu-index": 2, + "qom-path": "/machine/unattached/device[1]/thread[2]", + "thread-id": 21927 }, { "arch": "ppc", "current": false, - "CPU": 3, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[3]", - "halted": false, - "thread_id": 21928 + "cpu-index": 3, + "qom-path": "/machine/unattached/device[1]/thread[3]", + "thread-id": 21928 }, { "arch": "ppc", "current": false, - "CPU": 4, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[4]", - "halted": false, - "thread_id": 21930 + "cpu-index": 4, + "qom-path": "/machine/unattached/device[1]/thread[4]", + "thread-id": 21930 }, { "arch": "ppc", "current": false, - "CPU": 5, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[5]", - "halted": false, - "thread_id": 21931 + "cpu-index": 5, + "qom-path": "/machine/unattached/device[1]/thread[5]", + "thread-id": 21931 }, { "arch": "ppc", "current": false, - "CPU": 6, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[6]", - "halted": false, - "thread_id": 21932 + "cpu-index": 6, + "qom-path": "/machine/unattached/device[1]/thread[6]", + "thread-id": 21932 }, { "arch": "ppc", "current": false, - "CPU": 7, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[7]", - "halted": false, - "thread_id": 21933 + "cpu-index": 7, + "qom-path": "/machine/unattached/device[1]/thread[7]", + "thread-id": 21933 } ], "id": "libvirt-12" diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hotplug-1-cpus.json b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hotplug-1-cpus.json index 7771cbc636..1516ccb99f 100644 --- a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hotplug-1-cpus.json +++ b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hotplug-1-cpus.json @@ -3,146 +3,162 @@ { "arch": "ppc", "current": true, - "CPU": 0, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[0]", - "halted": false, - "thread_id": 21925 + "cpu-index": 0, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[0]", + "thread-id": 21925 }, { "arch": "ppc", "current": false, - "CPU": 1, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[1]", - "halted": false, - "thread_id": 21926 + "cpu-index": 1, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[1]", + "thread-id": 21926 }, { "arch": "ppc", "current": false, - "CPU": 2, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[2]", - "halted": false, - "thread_id": 21927 + "cpu-index": 2, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[2]", + "thread-id": 21927 }, { "arch": "ppc", "current": false, - "CPU": 3, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[3]", - "halted": false, - "thread_id": 21928 + "cpu-index": 3, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[3]", + "thread-id": 21928 }, { "arch": "ppc", "current": false, - "CPU": 4, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[4]", - "halted": false, - "thread_id": 21930 + "cpu-index": 4, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[4]", + "thread-id": 21930 }, { "arch": "ppc", "current": false, - "CPU": 5, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[5]", - "halted": false, - "thread_id": 21931 + "cpu-index": 5, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[5]", + "thread-id": 21931 }, { "arch": "ppc", "current": false, - "CPU": 6, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[6]", - "halted": false, - "thread_id": 21932 + "cpu-index": 6, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[6]", + "thread-id": 21932 }, { "arch": "ppc", "current": false, - "CPU": 7, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[7]", - "halted": false, - "thread_id": 21933 + "cpu-index": 7, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[7]", + "thread-id": 21933 }, { "arch": "ppc", "current": false, - "CPU": 8, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu0/thread[0]", - "halted": false, - "thread_id": 22131 + "cpu-index": 8, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[0]", + "thread-id": 22131 }, { "arch": "ppc", "current": false, - "CPU": 9, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu0/thread[1]", - "halted": false, - "thread_id": 22132 + "cpu-index": 9, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[1]", + "thread-id": 22132 }, { "arch": "ppc", "current": false, - "CPU": 10, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu0/thread[2]", - "halted": false, - "thread_id": 22133 + "cpu-index": 10, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[2]", + "thread-id": 22133 }, { "arch": "ppc", "current": false, - "CPU": 11, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu0/thread[3]", - "halted": false, - "thread_id": 22134 + "cpu-index": 11, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[3]", + "thread-id": 22134 }, { "arch": "ppc", "current": false, - "CPU": 12, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu0/thread[4]", - "halted": false, - "thread_id": 22135 + "cpu-index": 12, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[4]", + "thread-id": 22135 }, { "arch": "ppc", "current": false, - "CPU": 13, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu0/thread[5]", - "halted": false, - "thread_id": 22136 + "cpu-index": 13, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[5]", + "thread-id": 22136 }, { "arch": "ppc", "current": false, - "CPU": 14, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu0/thread[6]", - "halted": false, - "thread_id": 22137 + "cpu-index": 14, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[6]", + "thread-id": 22137 }, { "arch": "ppc", "current": false, - "CPU": 15, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu0/thread[7]", - "halted": false, - "thread_id": 22138 + "cpu-index": 15, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[7]", + "thread-id": 22138 } ], "id": "libvirt-14" diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hotplug-2-cpus.json b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hotplug-2-cpus.json index b377b6a0f6..d5068df8cc 100644 --- a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hotplug-2-cpus.json +++ b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hotplug-2-cpus.json @@ -3,218 +3,242 @@ { "arch": "ppc", "current": true, - "CPU": 0, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[0]", - "halted": false, - "thread_id": 21925 + "cpu-index": 0, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[0]", + "thread-id": 21925 }, { "arch": "ppc", "current": false, - "CPU": 1, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[1]", - "halted": false, - "thread_id": 21926 + "cpu-index": 1, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[1]", + "thread-id": 21926 }, { "arch": "ppc", "current": false, - "CPU": 2, - "nip": -4611686018422360576, - "qom_path": "/machine/unattached/device[1]/thread[2]", - "halted": false, - "thread_id": 21927 + "cpu-index": 2, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[2]", + "thread-id": 21927 }, { "arch": "ppc", "current": false, - "CPU": 3, - "nip": -4611686018422360596, - "qom_path": "/machine/unattached/device[1]/thread[3]", - "halted": false, - "thread_id": 21928 + "cpu-index": 3, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[3]", + "thread-id": 21928 }, { "arch": "ppc", "current": false, - "CPU": 4, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[4]", - "halted": false, - "thread_id": 21930 + "cpu-index": 4, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[4]", + "thread-id": 21930 }, { "arch": "ppc", "current": false, - "CPU": 5, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[5]", - "halted": false, - "thread_id": 21931 + "cpu-index": 5, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[5]", + "thread-id": 21931 }, { "arch": "ppc", "current": false, - "CPU": 6, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[6]", - "halted": false, - "thread_id": 21932 + "cpu-index": 6, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[6]", + "thread-id": 21932 }, { "arch": "ppc", "current": false, - "CPU": 7, - "nip": -4611686018422360596, - "qom_path": "/machine/unattached/device[1]/thread[7]", - "halted": false, - "thread_id": 21933 + "cpu-index": 7, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[7]", + "thread-id": 21933 }, { "arch": "ppc", "current": false, - "CPU": 8, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu0/thread[0]", - "halted": false, - "thread_id": 22131 + "cpu-index": 8, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[0]", + "thread-id": 22131 }, { "arch": "ppc", "current": false, - "CPU": 9, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu0/thread[1]", - "halted": false, - "thread_id": 22132 + "cpu-index": 9, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[1]", + "thread-id": 22132 }, { "arch": "ppc", "current": false, - "CPU": 10, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu0/thread[2]", - "halted": false, - "thread_id": 22133 + "cpu-index": 10, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[2]", + "thread-id": 22133 }, { "arch": "ppc", "current": false, - "CPU": 11, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu0/thread[3]", - "halted": false, - "thread_id": 22134 + "cpu-index": 11, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[3]", + "thread-id": 22134 }, { "arch": "ppc", "current": false, - "CPU": 12, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu0/thread[4]", - "halted": false, - "thread_id": 22135 + "cpu-index": 12, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[4]", + "thread-id": 22135 }, { "arch": "ppc", "current": false, - "CPU": 13, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu0/thread[5]", - "halted": false, - "thread_id": 22136 + "cpu-index": 13, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[5]", + "thread-id": 22136 }, { "arch": "ppc", "current": false, - "CPU": 14, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu0/thread[6]", - "halted": false, - "thread_id": 22137 + "cpu-index": 14, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[6]", + "thread-id": 22137 }, { "arch": "ppc", "current": false, - "CPU": 15, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu0/thread[7]", - "halted": false, - "thread_id": 22138 + "cpu-index": 15, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[7]", + "thread-id": 22138 }, { "arch": "ppc", "current": false, - "CPU": 16, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu1/thread[0]", - "halted": false, - "thread_id": 22223 + "cpu-index": 16, + "props": { + "core-id": 16 + }, + "qom-path": "/machine/peripheral/vcpu1/thread[0]", + "thread-id": 22223 }, { "arch": "ppc", "current": false, - "CPU": 17, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu1/thread[1]", - "halted": false, - "thread_id": 22224 + "cpu-index": 17, + "props": { + "core-id": 16 + }, + "qom-path": "/machine/peripheral/vcpu1/thread[1]", + "thread-id": 22224 }, { "arch": "ppc", "current": false, - "CPU": 18, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu1/thread[2]", - "halted": false, - "thread_id": 22225 + "cpu-index": 18, + "props": { + "core-id": 16 + }, + "qom-path": "/machine/peripheral/vcpu1/thread[2]", + "thread-id": 22225 }, { "arch": "ppc", "current": false, - "CPU": 19, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu1/thread[3]", - "halted": false, - "thread_id": 22226 + "cpu-index": 19, + "props": { + "core-id": 16 + }, + "qom-path": "/machine/peripheral/vcpu1/thread[3]", + "thread-id": 22226 }, { "arch": "ppc", "current": false, - "CPU": 20, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu1/thread[4]", - "halted": false, - "thread_id": 22227 + "cpu-index": 20, + "props": { + "core-id": 16 + }, + "qom-path": "/machine/peripheral/vcpu1/thread[4]", + "thread-id": 22227 }, { "arch": "ppc", "current": false, - "CPU": 21, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu1/thread[5]", - "halted": false, - "thread_id": 22228 + "cpu-index": 21, + "props": { + "core-id": 16 + }, + "qom-path": "/machine/peripheral/vcpu1/thread[5]", + "thread-id": 22228 }, { "arch": "ppc", "current": false, - "CPU": 22, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu1/thread[6]", - "halted": false, - "thread_id": 22229 + "cpu-index": 22, + "props": { + "core-id": 16 + }, + "qom-path": "/machine/peripheral/vcpu1/thread[6]", + "thread-id": 22229 }, { "arch": "ppc", "current": false, - "CPU": 23, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu1/thread[7]", - "halted": false, - "thread_id": 22230 + "cpu-index": 23, + "props": { + "core-id": 16 + }, + "qom-path": "/machine/peripheral/vcpu1/thread[7]", + "thread-id": 22230 } ], "id": "libvirt-17" diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hotplug-4-cpus.json b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hotplug-4-cpus.json index bcb6eab273..2b9a14282d 100644 --- a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hotplug-4-cpus.json +++ b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hotplug-4-cpus.json @@ -3,218 +3,242 @@ { "arch": "ppc", "current": true, - "CPU": 0, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[0]", - "halted": false, - "thread_id": 21925 + "cpu-index": 0, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[0]", + "thread-id": 21925 }, { "arch": "ppc", "current": false, - "CPU": 1, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[1]", - "halted": false, - "thread_id": 21926 + "cpu-index": 1, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[1]", + "thread-id": 21926 }, { "arch": "ppc", "current": false, - "CPU": 2, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[2]", - "halted": false, - "thread_id": 21927 + "cpu-index": 2, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[2]", + "thread-id": 21927 }, { "arch": "ppc", "current": false, - "CPU": 3, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[3]", - "halted": false, - "thread_id": 21928 + "cpu-index": 3, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[3]", + "thread-id": 21928 }, { "arch": "ppc", "current": false, - "CPU": 4, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[4]", - "halted": false, - "thread_id": 21930 + "cpu-index": 4, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[4]", + "thread-id": 21930 }, { "arch": "ppc", "current": false, - "CPU": 5, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[5]", - "halted": false, - "thread_id": 21931 + "cpu-index": 5, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[5]", + "thread-id": 21931 }, { "arch": "ppc", "current": false, - "CPU": 6, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[6]", - "halted": false, - "thread_id": 21932 + "cpu-index": 6, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[6]", + "thread-id": 21932 }, { "arch": "ppc", "current": false, - "CPU": 7, - "nip": -4611686018426772172, - "qom_path": "/machine/unattached/device[1]/thread[7]", - "halted": false, - "thread_id": 21933 + "cpu-index": 7, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[7]", + "thread-id": 21933 }, { "arch": "ppc", "current": false, - "CPU": 8, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu1/thread[0]", - "halted": false, - "thread_id": 22741 + "cpu-index": 8, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu1/thread[0]", + "thread-id": 22741 }, { "arch": "ppc", "current": false, - "CPU": 9, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu1/thread[1]", - "halted": false, - "thread_id": 22742 + "cpu-index": 9, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu1/thread[1]", + "thread-id": 22742 }, { "arch": "ppc", "current": false, - "CPU": 10, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu1/thread[2]", - "halted": false, - "thread_id": 22743 + "cpu-index": 10, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu1/thread[2]", + "thread-id": 22743 }, { "arch": "ppc", "current": false, - "CPU": 11, - "nip": -4611686018419474700, - "qom_path": "/machine/peripheral/vcpu1/thread[3]", - "halted": false, - "thread_id": 22744 + "cpu-index": 11, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu1/thread[3]", + "thread-id": 22744 }, { "arch": "ppc", "current": false, - "CPU": 12, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu1/thread[4]", - "halted": false, - "thread_id": 22745 + "cpu-index": 12, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu1/thread[4]", + "thread-id": 22745 }, { "arch": "ppc", "current": false, - "CPU": 13, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu1/thread[5]", - "halted": false, - "thread_id": 22746 + "cpu-index": 13, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu1/thread[5]", + "thread-id": 22746 }, { "arch": "ppc", "current": false, - "CPU": 14, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu1/thread[6]", - "halted": false, - "thread_id": 22747 + "cpu-index": 14, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu1/thread[6]", + "thread-id": 22747 }, { "arch": "ppc", "current": false, - "CPU": 15, - "nip": -4611686018426772172, - "qom_path": "/machine/peripheral/vcpu1/thread[7]", - "halted": false, - "thread_id": 22748 + "cpu-index": 15, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/peripheral/vcpu1/thread[7]", + "thread-id": 22748 }, { "arch": "ppc", "current": false, - "CPU": 16, - "nip": 0, - "qom_path": "/machine/peripheral/vcpu0/thread[0]", - "halted": true, - "thread_id": 23170 + "cpu-index": 16, + "props": { + "core-id": 16 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[0]", + "thread-id": 23170 }, { "arch": "ppc", "current": false, - "CPU": 17, - "nip": 0, - "qom_path": "/machine/peripheral/vcpu0/thread[1]", - "halted": true, - "thread_id": 23171 + "cpu-index": 17, + "props": { + "core-id": 16 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[1]", + "thread-id": 23171 }, { "arch": "ppc", "current": false, - "CPU": 18, - "nip": 0, - "qom_path": "/machine/peripheral/vcpu0/thread[2]", - "halted": true, - "thread_id": 23172 + "cpu-index": 18, + "props": { + "core-id": 16 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[2]", + "thread-id": 23172 }, { "arch": "ppc", "current": false, - "CPU": 19, - "nip": 0, - "qom_path": "/machine/peripheral/vcpu0/thread[3]", - "halted": true, - "thread_id": 23173 + "cpu-index": 19, + "props": { + "core-id": 16 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[3]", + "thread-id": 23173 }, { "arch": "ppc", "current": false, - "CPU": 20, - "nip": 0, - "qom_path": "/machine/peripheral/vcpu0/thread[4]", - "halted": true, - "thread_id": 23174 + "cpu-index": 20, + "props": { + "core-id": 16 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[4]", + "thread-id": 23174 }, { "arch": "ppc", "current": false, - "CPU": 21, - "nip": 0, - "qom_path": "/machine/peripheral/vcpu0/thread[5]", - "halted": true, - "thread_id": 23175 + "cpu-index": 21, + "props": { + "core-id": 16 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[5]", + "thread-id": 23175 }, { "arch": "ppc", "current": false, - "CPU": 22, - "nip": 0, - "qom_path": "/machine/peripheral/vcpu0/thread[6]", - "halted": true, - "thread_id": 23176 + "cpu-index": 22, + "props": { + "core-id": 16 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[6]", + "thread-id": 23176 }, { "arch": "ppc", "current": false, - "CPU": 23, - "nip": 0, - "qom_path": "/machine/peripheral/vcpu0/thread[7]", - "halted": true, - "thread_id": 23177 + "cpu-index": 23, + "props": { + "core-id": 16 + }, + "qom-path": "/machine/peripheral/vcpu0/thread[7]", + "thread-id": 23177 } ], "id": "libvirt-37" diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hotplug-4.data b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hotplug-4.data index 5f6b8656c9..7c9088928b 100644 --- a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hotplug-4.data +++ b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-hotplug-4.data @@ -52,49 +52,41 @@ alias='vcpu0' qom_path='/machine/peripheral/vcpu0' topology: core='8' vcpus='8' - halted [vcpu libvirt-id='9'] online=yes hotpluggable=yes thread-id='23171' query-cpus-id='17' - halted [vcpu libvirt-id='10'] online=yes hotpluggable=yes thread-id='23172' query-cpus-id='18' - halted [vcpu libvirt-id='11'] online=yes hotpluggable=yes thread-id='23173' query-cpus-id='19' - halted [vcpu libvirt-id='12'] online=yes hotpluggable=yes thread-id='23174' query-cpus-id='20' - halted [vcpu libvirt-id='13'] online=yes hotpluggable=yes thread-id='23175' query-cpus-id='21' - halted [vcpu libvirt-id='14'] online=yes hotpluggable=yes thread-id='23176' query-cpus-id='22' - halted [vcpu libvirt-id='15'] online=yes hotpluggable=yes thread-id='23177' query-cpus-id='23' - halted [vcpu libvirt-id='16'] online=yes hotpluggable=yes diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-no-threads-cpus.json b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-no-threads-cpus.json index 31a3905e43..0ee53ae471 100644 --- a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-no-threads-cpus.json +++ b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-ppc64-no-threads-cpus.json @@ -3,74 +3,82 @@ { "arch": "ppc", "current": true, - "CPU": 0, - "nip": -4611686018426772876, - "qom_path": "/machine/unattached/device[1]/thread[0]", - "halted": false, - "thread_id": 35232 + "cpu-index": 0, + "props": { + "core-id": 0 + }, + "qom-path": "/machine/unattached/device[1]/thread[0]", + "thread-id": 35232 }, { "arch": "ppc", "current": false, - "CPU": 1, - "nip": -4611686018426772876, - "qom_path": "/machine/unattached/device[2]/thread[0]", - "halted": false, - "thread_id": 35233 + "cpu-index": 1, + "props": { + "core-id": 8 + }, + "qom-path": "/machine/unattached/device[2]/thread[0]", + "thread-id": 35233 }, { "arch": "ppc", "current": false, - "CPU": 2, - "nip": -4611686018426772876, - "qom_path": "/machine/unattached/device[3]/thread[0]", - "halted": false, - "thread_id": 35234 + "cpu-index": 2, + "props": { + "core-id": 16 + }, + "qom-path": "/machine/unattached/device[3]/thread[0]", + "thread-id": 35234 }, { "arch": "ppc", "current": false, - "CPU": 3, - "nip": -4611686018426772876, - "qom_path": "/machine/unattached/device[4]/thread[0]", - "halted": false, - "thread_id": 35235 + "cpu-index": 3, + "props": { + "core-id": 24 + }, + "qom-path": "/machine/unattached/device[4]/thread[0]", + "thread-id": 35235 }, { "arch": "ppc", "current": false, - "CPU": 4, - "nip": -4611686018426772876, - "qom_path": "/machine/unattached/device[5]/thread[0]", - "halted": false, - "thread_id": 35236 + "cpu-index": 4, + "props": { + "core-id": 32 + }, + "qom-path": "/machine/unattached/device[5]/thread[0]", + "thread-id": 35236 }, { "arch": "ppc", "current": false, - "CPU": 5, - "nip": -4611686018426772876, - "qom_path": "/machine/unattached/device[6]/thread[0]", - "halted": false, - "thread_id": 35237 + "cpu-index": 5, + "props": { + "core-id": 40 + }, + "qom-path": "/machine/unattached/device[6]/thread[0]", + "thread-id": 35237 }, { "arch": "ppc", "current": false, - "CPU": 6, - "nip": -4611686018426772876, - "qom_path": "/machine/unattached/device[7]/thread[0]", - "halted": false, - "thread_id": 35238 + "cpu-index": 6, + "props": { + "core-id": 48 + }, + "qom-path": "/machine/unattached/device[7]/thread[0]", + "thread-id": 35238 }, { "arch": "ppc", "current": false, - "CPU": 7, - "nip": -4611686018426772876, - "qom_path": "/machine/unattached/device[8]/thread[0]", - "halted": false, - "thread_id": 35239 + "cpu-index": 7, + "props": { + "core-id": 56 + }, + "qom-path": "/machine/unattached/device[8]/thread[0]", + "thread-id": 35239 } ], "id": "libvirt-11" diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index d0a12d14e0..56620f16a6 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -3119,11 +3119,11 @@ mymain(void) DO_TEST_CPU_INFO("x86-node-full", 8); DO_TEST_CPU_INFO_FAST("x86-dies", 16); - DO_TEST_CPU_INFO("ppc64-basic", 24); - DO_TEST_CPU_INFO("ppc64-hotplug-1", 24); - DO_TEST_CPU_INFO("ppc64-hotplug-2", 24); - DO_TEST_CPU_INFO("ppc64-hotplug-4", 24); - DO_TEST_CPU_INFO("ppc64-no-threads", 16); + DO_TEST_CPU_INFO_FAST("ppc64-basic", 24); + DO_TEST_CPU_INFO_FAST("ppc64-hotplug-1", 24); + DO_TEST_CPU_INFO_FAST("ppc64-hotplug-2", 24); + DO_TEST_CPU_INFO_FAST("ppc64-hotplug-4", 24); + DO_TEST_CPU_INFO_FAST("ppc64-no-threads", 16); DO_TEST_CPU_INFO_FAST("s390", 2); -- 2.37.1