Skip to content

Commit aa601bd

Browse files
huthFabiano Rosas
authored andcommitted
tests/qtest/test-x86-cpuid-compat: Remove tests related to pc-i440fx-2.3
The pc-i440fx-2.3 machine type has been removed in commit 46a2bd5 ("hw/i386/pc: Remove deprecated pc-i440fx-2.3 machine") already, so these tests are just dead code by now. Signed-off-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Fabiano Rosas <farosas@suse.de> Link: https://lore.kernel.org/r/20250117102738.59714-2-thuth@redhat.com Signed-off-by: Fabiano Rosas <farosas@suse.de>
1 parent 3dec966 commit aa601bd

File tree

1 file changed

+0
-18
lines changed

1 file changed

+0
-18
lines changed

tests/qtest/test-x86-cpuid-compat.c

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -357,19 +357,6 @@ int main(int argc, char **argv)
357357
"486", "xstore=on", "pc-i440fx-2.7",
358358
"xlevel2", 0);
359359
}
360-
/*
361-
* QEMU 2.3.0 had auto-level enabled for CPUID[7], already,
362-
* and the compat code that sets default level shouldn't
363-
* disable the auto-level=7 code:
364-
*/
365-
if (qtest_has_machine("pc-i440fx-2.3")) {
366-
add_cpuid_test("x86/cpuid/auto-level7/pc-i440fx-2.3/off",
367-
"Penryn", NULL, "pc-i440fx-2.3",
368-
"level", 4);
369-
add_cpuid_test("x86/cpuid/auto-level7/pc-i440fx-2.3/on",
370-
"Penryn", "erms=on", "pc-i440fx-2.3",
371-
"level", 7);
372-
}
373360
if (qtest_has_machine("pc-i440fx-2.9")) {
374361
add_cpuid_test("x86/cpuid/auto-level7/pc-i440fx-2.9/off",
375362
"Conroe", NULL, "pc-i440fx-2.9",
@@ -384,11 +371,6 @@ int main(int argc, char **argv)
384371
* code on old machine-types. Just check that the compat code
385372
* is working correctly:
386373
*/
387-
if (qtest_has_machine("pc-i440fx-2.3")) {
388-
add_cpuid_test("x86/cpuid/xlevel-compat/pc-i440fx-2.3",
389-
"SandyBridge", NULL, "pc-i440fx-2.3",
390-
"xlevel", 0x8000000a);
391-
}
392374
if (qtest_has_machine("pc-i440fx-2.4")) {
393375
add_cpuid_test("x86/cpuid/xlevel-compat/pc-i440fx-2.4/npt-off",
394376
"SandyBridge", NULL, "pc-i440fx-2.4",

0 commit comments

Comments
 (0)