From: Jiri Denemark <jdenemar@redhat.com>
Date: Thu, 2 Jun 2016 08:17:22 +0000 (+0200)
Subject: cputest: Rename nehalem-force to penryn-force
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ee12b781892c61ee07f4ed54b71107a0350c384c;p=libvirt.git

cputest: Rename nehalem-force to penryn-force

The actual CPU model in the data files is Penryn which makes the file
name look rather strange. Well, one of them contains Nehalem, but that's
a bug which will be fixed soon.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---

diff --git a/tests/cputest.c b/tests/cputest.c
index 3682101597..f68a3ec8f1 100644
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -749,7 +749,7 @@ mymain(void)
     DO_TEST_COMPARE("x86", "host", "guest", VIR_CPU_COMPARE_SUPERSET);
     DO_TEST_COMPARE("x86", "host", "pentium3-amd", VIR_CPU_COMPARE_INCOMPATIBLE);
     DO_TEST_COMPARE("x86", "host-amd", "pentium3-amd", VIR_CPU_COMPARE_SUPERSET);
-    DO_TEST_COMPARE("x86", "host-worse", "nehalem-force", VIR_CPU_COMPARE_IDENTICAL);
+    DO_TEST_COMPARE("x86", "host-worse", "penryn-force", VIR_CPU_COMPARE_IDENTICAL);
     DO_TEST_COMPARE("x86", "host-SandyBridge", "exact-force-Haswell", VIR_CPU_COMPARE_IDENTICAL);
 
     DO_TEST_COMPARE("ppc64", "host", "guest-strict", VIR_CPU_COMPARE_IDENTICAL);
@@ -820,7 +820,7 @@ mymain(void)
     DO_TEST_GUESTDATA("x86", "host-better", "pentium3", NULL, "core2duo", 0);
     DO_TEST_GUESTDATA("x86", "host-worse", "guest", NULL, NULL, 0);
     DO_TEST_GUESTDATA("x86", "host", "strict-force-extra", NULL, NULL, 0);
-    DO_TEST_GUESTDATA("x86", "host", "nehalem-force", NULL, NULL, 0);
+    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);
diff --git a/tests/cputestdata/x86-host+nehalem-force-result.xml b/tests/cputestdata/x86-host+nehalem-force-result.xml
deleted file mode 100644
index 000bc0d61b..0000000000
--- a/tests/cputestdata/x86-host+nehalem-force-result.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>x86_64</arch>
-  <model fallback='allow'>Nehalem</model>
-</cpu>
diff --git a/tests/cputestdata/x86-host+penryn-force-result.xml b/tests/cputestdata/x86-host+penryn-force-result.xml
new file mode 100644
index 0000000000..000bc0d61b
--- /dev/null
+++ b/tests/cputestdata/x86-host+penryn-force-result.xml
@@ -0,0 +1,4 @@
+<cpu mode='custom' match='exact'>
+  <arch>x86_64</arch>
+  <model fallback='allow'>Nehalem</model>
+</cpu>
diff --git a/tests/cputestdata/x86-nehalem-force.xml b/tests/cputestdata/x86-nehalem-force.xml
deleted file mode 100644
index 12fd274bd4..0000000000
--- a/tests/cputestdata/x86-nehalem-force.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<cpu match='exact'>
-  <model>Penryn</model>
-  <feature name='popcnt' policy='force'/>
-  <feature name='sse4.2' policy='force'/>
-</cpu>
diff --git a/tests/cputestdata/x86-penryn-force.xml b/tests/cputestdata/x86-penryn-force.xml
new file mode 100644
index 0000000000..12fd274bd4
--- /dev/null
+++ b/tests/cputestdata/x86-penryn-force.xml
@@ -0,0 +1,5 @@
+<cpu match='exact'>
+  <model>Penryn</model>
+  <feature name='popcnt' policy='force'/>
+  <feature name='sse4.2' policy='force'/>
+</cpu>