[PATCH 39/51] qemuxml2argvtest: Modernize 'cpu-Haswell' test cases

Modernize all test cases which set 'Haswell' as the host cpu model. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- ...X.args => cpu-Haswell-noTSX.x86_64-latest.args} | 0 ...Haswell.args => cpu-Haswell.x86_64-latest.args} | 0 ...swell2.args => cpu-Haswell2.x86_64-latest.args} | 0 ...swell3.args => cpu-Haswell3.x86_64-latest.args} | 0 ....args => cpu-host-model-cmt.x86_64-latest.args} | 0 ...y.args => cpu-tsc-frequency.x86_64-latest.args} | 0 tests/qemuxml2argvtest.c | 14 ++++++-------- 7 files changed, 6 insertions(+), 8 deletions(-) rename tests/qemuxml2argvdata/{cpu-Haswell-noTSX.args => cpu-Haswell-noTSX.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{cpu-Haswell.args => cpu-Haswell.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{cpu-Haswell2.args => cpu-Haswell2.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{cpu-Haswell3.args => cpu-Haswell3.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{cpu-host-model-cmt.args => cpu-host-model-cmt.x86_64-latest.args} (100%) rename tests/qemuxml2argvdata/{cpu-tsc-frequency.args => cpu-tsc-frequency.x86_64-latest.args} (100%) diff --git a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args b/tests/qemuxml2argvdata/cpu-Haswell-noTSX.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-Haswell-noTSX.args rename to tests/qemuxml2argvdata/cpu-Haswell-noTSX.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-Haswell.args b/tests/qemuxml2argvdata/cpu-Haswell.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-Haswell.args rename to tests/qemuxml2argvdata/cpu-Haswell.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-Haswell2.args b/tests/qemuxml2argvdata/cpu-Haswell2.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-Haswell2.args rename to tests/qemuxml2argvdata/cpu-Haswell2.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-Haswell3.args b/tests/qemuxml2argvdata/cpu-Haswell3.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-Haswell3.args rename to tests/qemuxml2argvdata/cpu-Haswell3.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-host-model-cmt.args b/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-host-model-cmt.args rename to tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-latest.args diff --git a/tests/qemuxml2argvdata/cpu-tsc-frequency.args b/tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-latest.args similarity index 100% rename from tests/qemuxml2argvdata/cpu-tsc-frequency.args rename to tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-latest.args diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 050d38c3fc..a3e137e1c1 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1805,14 +1805,12 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("cpu-s390-zEC12", "s390x"); DO_TEST_CAPS_ARCH_LATEST("cpu-s390-features", "s390x"); - qemuTestSetHostCPU(&driver, driver.hostarch, qemuTestGetCPUDef(QEMU_CPU_DEF_HASWELL)); - DO_TEST("cpu-Haswell", QEMU_CAPS_KVM); - DO_TEST("cpu-Haswell2", QEMU_CAPS_KVM); - DO_TEST("cpu-Haswell3", QEMU_CAPS_KVM); - DO_TEST("cpu-Haswell-noTSX", QEMU_CAPS_KVM); - DO_TEST_NOCAPS("cpu-host-model-cmt"); - DO_TEST("cpu-tsc-frequency", QEMU_CAPS_KVM); - qemuTestSetHostCPU(&driver, driver.hostarch, NULL); + DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-Haswell", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL); + DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-Haswell2", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL); + DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-Haswell3", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL); + DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-Haswell-noTSX", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL); + DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-host-model-cmt", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL); + DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-tsc-frequency", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL); DO_TEST_CAPS_LATEST("cpu-translation"); -- 2.41.0