The query-cpus-fast command was introduced in 2.12, therefore query-cpus
is never used on supported versions of QEMU. Remove the logic to parse
its output, as well as the parameters to choose between the two commands.
Since most tests were still mocking the query-cpus command, the expected
results of QEMU monitor commands have to be converted as well.
Thanks,
Paolo
Paolo Bonzini (7):
tests: remove duplicate cpuinfo test
tests: drop "-fast" from query-cpus-fast tests
tests: convert ppc64 tests to query-cpus-fast
tests: convert x86_64 tests to query-cpus-fast
tests: remove query-cpus tests
qemu: remove support for query-cpus
qemu: deprecate query-cpus-fast capability
src/qemu/qemu_capabilities.c | 4 +-
src/qemu/qemu_capabilities.h | 2 +-
src/qemu/qemu_domain.c | 22 +-
src/qemu/qemu_monitor.c | 29 +-
src/qemu/qemu_monitor.h | 6 +-
src/qemu/qemu_monitor_json.c | 44 +--
src/qemu/qemu_monitor_json.h | 3 +-
tests/qemuhotplugtest.c | 2 -
...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 +++---
...=> qemumonitorjson-cpuinfo-s390-cpus.json} | 0
...qemumonitorjson-cpuinfo-s390-hotplug.json} | 0
...data => qemumonitorjson-cpuinfo-s390.data} | 0
...json-cpuinfo-x86-basic-pluggable-cpus.json | 65 +++--
...nitorjson-cpuinfo-x86-basic-pluggable.data | 5 -
...qemumonitorjson-cpuinfo-x86-full-cpus.json | 154 +++++-----
...onitorjson-cpuinfo-x86-full-fast-cpus.json | 126 ---------
...torjson-cpuinfo-x86-full-fast-hotplug.json | 115 --------
...qemumonitorjson-cpuinfo-x86-full-fast.data | 109 --------
...onitorjson-cpuinfo-x86-node-full-cpus.json | 16 +-
...qemumonitorjson-cpuinfo-x86-node-full.data | 2 -
tests/qemumonitorjsontest.c | 102 +------
26 files changed, 628 insertions(+), 1042 deletions(-)
rename tests/qemumonitorjsondata/{qemumonitorjson-cpuinfo-s390-fast-cpus.json => qemumonitorjson-cpuinfo-s390-cpus.json} (100%)
rename tests/qemumonitorjsondata/{qemumonitorjson-cpuinfo-s390-fast-hotplug.json => qemumonitorjson-cpuinfo-s390-hotplug.json} (100%)
rename tests/qemumonitorjsondata/{qemumonitorjson-cpuinfo-s390-fast.data => qemumonitorjson-cpuinfo-s390.data} (100%)
delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full-fast-cpus.json
delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full-fast-hotplug.json
delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full-fast.data
--
2.37.1
