From f60c5e4eb607f3fb70a6645de004cc73f81dffab Mon Sep 17 00:00:00 2001 From: Jiri Denemark Date: Tue, 8 Nov 2016 21:36:57 +0100 Subject: [PATCH] cputest: Don't use unsupported preferred model Using a preferred CPU model which is not in the list of CPU models supported by a hypervisor does not make sense. Signed-off-by: Jiri Denemark --- tests/cputest.c | 2 -- .../x86-host+guest,models,Penryn-result.xml | 13 ------------- .../x86-host+guest,models,qemu64-result.xml | 13 ------------- 3 files changed, 28 deletions(-) delete mode 100644 tests/cputestdata/x86-host+guest,models,Penryn-result.xml delete mode 100644 tests/cputestdata/x86-host+guest,models,qemu64-result.xml diff --git a/tests/cputest.c b/tests/cputest.c index 7f27521a6e..16be61b596 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -797,8 +797,6 @@ mymain(void) DO_TEST_GUESTDATA("x86", "host", "penryn-force", NULL, NULL, 0); DO_TEST_GUESTDATA("x86", "host", "guest", model486, NULL, 0); DO_TEST_GUESTDATA("x86", "host", "guest", models, NULL, 0); - DO_TEST_GUESTDATA("x86", "host", "guest", models, "Penryn", 0); - DO_TEST_GUESTDATA("x86", "host", "guest", models, "qemu64", 0); DO_TEST_GUESTDATA("x86", "host", "guest", nomodel, NULL, -1); DO_TEST_GUESTDATA("x86", "host", "guest-nofallback", models, "Penryn", -1); DO_TEST_GUESTDATA("x86", "host", "host+host-model", models, "Penryn", 0); diff --git a/tests/cputestdata/x86-host+guest,models,Penryn-result.xml b/tests/cputestdata/x86-host+guest,models,Penryn-result.xml deleted file mode 100644 index 6cd0668326..0000000000 --- a/tests/cputestdata/x86-host+guest,models,Penryn-result.xml +++ /dev/null @@ -1,13 +0,0 @@ - - x86_64 - Nehalem - - - - - - - - - - diff --git a/tests/cputestdata/x86-host+guest,models,qemu64-result.xml b/tests/cputestdata/x86-host+guest,models,qemu64-result.xml deleted file mode 100644 index 8b170e5fa5..0000000000 --- a/tests/cputestdata/x86-host+guest,models,qemu64-result.xml +++ /dev/null @@ -1,13 +0,0 @@ - - x86_64 - qemu64 - - - - - - - - - -