Re: [PATCH 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-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": -46116860184chine/unattached/device[2]/thread[0]", + "thread-id": 35233 },