tests: drop "-fast" from query-cpus-fast tests

All supported versions of QEMU include the query-cpus-fast QMP command.
In preparation for dropping support for the old "query-cpus" commands,
remove the "-fast" suffix from both x86-full-fast and s390-fast.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>

diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-s390-fast-cpus.json b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-s390-cpus.json
similarity index 100%
rename from tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-s390-fast-cpus.json
rename to tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-s390-cpus.json

diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-s390-fast-hotplug.json b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-s390-hotplug.json
similarity index 100%
rename from tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-s390-fast-hotplug.json
rename to tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-s390-hotplug.json

diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-s390-fast.data b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-s390.data
similarity index 100%
rename from tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-s390-fast.data
rename to tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-s390.data

diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full-fast-cpus.json b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full-cpus.json
similarity index 100%
rename from tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full-fast-cpus.json
rename to tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full-cpus.json

diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full-fast-hotplug.json b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full-hotplug.json
similarity index 100%
rename from tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full-fast-hotplug.json
rename to tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full-hotplug.json

diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full-fast.data b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full.data
similarity index 100%
rename from tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full-fast.data
rename to tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full.data

diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index 54ff240e97bd3aabd08911bc93a89f2fd23fd74d..d0a12d14e0727db403e04b30edf03cac5a6e201a 100644 (file)
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -3115,8 +3115,8 @@ mymain(void)
     DO_TEST_CPU_DATA("ecx");
 
     DO_TEST_CPU_INFO("x86-basic-pluggable", 8);
+    DO_TEST_CPU_INFO_FAST("x86-full", 11);
     DO_TEST_CPU_INFO("x86-node-full", 8);
-    DO_TEST_CPU_INFO_FAST("x86-full-fast", 11);
     DO_TEST_CPU_INFO_FAST("x86-dies", 16);
 
     DO_TEST_CPU_INFO("ppc64-basic", 24);
@@ -3125,7 +3125,7 @@ mymain(void)
     DO_TEST_CPU_INFO("ppc64-hotplug-4", 24);
     DO_TEST_CPU_INFO("ppc64-no-threads", 16);
 
-    DO_TEST_CPU_INFO_FAST("s390-fast", 2);
+    DO_TEST_CPU_INFO_FAST("s390", 2);
 
 #define DO_TEST_BLOCK_NODE_DETECT(testname) \
     do { \