@@ -357,19 +357,6 @@ int main(int argc, char **argv)
357
357
"486" , "xstore=on" , "pc-i440fx-2.7" ,
358
358
"xlevel2" , 0 );
359
359
}
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
- }
373
360
if (qtest_has_machine ("pc-i440fx-2.9" )) {
374
361
add_cpuid_test ("x86/cpuid/auto-level7/pc-i440fx-2.9/off" ,
375
362
"Conroe" , NULL , "pc-i440fx-2.9" ,
@@ -384,11 +371,6 @@ int main(int argc, char **argv)
384
371
* code on old machine-types. Just check that the compat code
385
372
* is working correctly:
386
373
*/
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
- }
392
374
if (qtest_has_machine ("pc-i440fx-2.4" )) {
393
375
add_cpuid_test ("x86/cpuid/xlevel-compat/pc-i440fx-2.4/npt-off" ,
394
376
"SandyBridge" , NULL , "pc-i440fx-2.4" ,
0 commit comments