[libvirt] [PATCH 4/4] Update cputest test cases for PowerPC CPU models

Prerna Saxena prerna at linux.vnet.ibm.com
Fri Oct 10 10:24:28 UTC 2014 

>From 67ca1c61d5e1c7de0c2d44e2ef47bc8bba39c159 Mon Sep 17 00:00:00 2001
From: "Pradipta Kr. Banerjee" <bpradip at in.ibm.com>
Date: Tue, 7 Oct 2014 13:38:28 +0530

With reference to the previous update of cpu_map.xml,
this patch fixes test cases for PowerPC CPUs.
This also updates a test case for compat mode, introduced previously
in the series.

Signed-off-by: Prerna Saxena <prerna at linux.vnet.ibm.com>
Signed-off-by: Pradipta Kr. Banerjee <bpradip at in.ibm.com>
Signed-off-by: Li Zhang <zhlcindy at linux.vnet.ibm.com>
---
 tests/cputest.c                                                      | 4 ++--
 tests/cputestdata/ppc64-baseline-1-result.xml                        | 2 +-
 tests/cputestdata/ppc64-baseline-incompatible-vendors.xml            | 4 ++--
 tests/cputestdata/ppc64-baseline-no-vendor-result.xml                | 2 +-
 tests/cputestdata/ppc64-baseline-no-vendor.xml                       | 2 +-
 tests/cputestdata/ppc64-exact.xml                                    | 2 +-
 tests/cputestdata/ppc64-guest-nofallback.xml                         | 2 +-
 tests/cputestdata/ppc64-guest.xml                                    | 2 +-
 tests/cputestdata/ppc64-host+guest,ppc_models-result.xml             | 2 +-
 .../ppc64-host+guest-nofallback,ppc_models,POWER7_v2.1-result.xml    | 5 -----
 .../ppc64-host+guest-nofallback,ppc_models,power7-result.xml         | 5 +++++
 tests/cputestdata/ppc64-host.xml                                     | 2 +-
 tests/cputestdata/ppc64-strict.xml                                   | 2 +-
 tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.args           | 3 ++-
 tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.xml            | 2 +-
 15 files changed, 21 insertions(+), 20 deletions(-)
 delete mode 100644 tests/cputestdata/ppc64-host+guest-nofallback,ppc_models,POWER7_v2.1-result.xml
 create mode 100644 tests/cputestdata/ppc64-host+guest-nofallback,ppc_models,power7-result.xml

diff --git a/tests/cputest.c b/tests/cputest.c
index a507576..96b9dbf 100644
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -496,7 +496,7 @@ cpuTestRun(const char *name, const struct data *data)
 static const char *model486[]   = { "486" };
 static const char *nomodel[]    = { "nomodel" };
 static const char *models[]     = { "qemu64", "core2duo", "Nehalem" };
-static const char *ppc_models[]     = { "POWER7", "POWER7_v2.1", "POWER8_v1.0"};
+static const char *ppc_models[]     = { "power6", "power7", "power8"};
 
 static int
 mymain(void)
@@ -643,7 +643,7 @@ mymain(void)
                       models, "Penryn", -1);
 
     DO_TEST_GUESTDATA("ppc64", "host", "guest", ppc_models, NULL, 0);
-    DO_TEST_GUESTDATA("ppc64", "host", "guest-nofallback", ppc_models, "POWER7_v2.1", -1);
+    DO_TEST_GUESTDATA("ppc64", "host", "guest-nofallback", ppc_models, "power7", -1);
 
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }
diff --git a/tests/cputestdata/ppc64-baseline-1-result.xml b/tests/cputestdata/ppc64-baseline-1-result.xml
index cbdd9bc..a330ef6 100644
--- a/tests/cputestdata/ppc64-baseline-1-result.xml
+++ b/tests/cputestdata/ppc64-baseline-1-result.xml
@@ -1,3 +1,3 @@
 <cpu mode='custom' match='exact'>
-  <model fallback='allow'>POWER7+_v2.1</model>
+  <model fallback='allow'>power7</model>
 </cpu>
diff --git a/tests/cputestdata/ppc64-baseline-incompatible-vendors.xml b/tests/cputestdata/ppc64-baseline-incompatible-vendors.xml
index 97d3c9c..10059c6 100644
--- a/tests/cputestdata/ppc64-baseline-incompatible-vendors.xml
+++ b/tests/cputestdata/ppc64-baseline-incompatible-vendors.xml
@@ -1,13 +1,13 @@
 <cpuTest>
 <cpu>
   <arch>ppc64</arch>
-  <model>POWER7+_v2.1</model>
+  <model>power7</model>
   <vendor>Intel</vendor>
   <topology sockets='2' cores='4' threads='1'/>
 </cpu>
 <cpu>
   <arch>ppc64</arch>
-  <model>POWER8_v1.0</model>
+  <model>power8</model>
   <vendor>Intel</vendor>
   <topology sockets='1' cores='1' threads='1'/>
 </cpu>
diff --git a/tests/cputestdata/ppc64-baseline-no-vendor-result.xml b/tests/cputestdata/ppc64-baseline-no-vendor-result.xml
index 36bae52..a330ef6 100644
--- a/tests/cputestdata/ppc64-baseline-no-vendor-result.xml
+++ b/tests/cputestdata/ppc64-baseline-no-vendor-result.xml
@@ -1,3 +1,3 @@
 <cpu mode='custom' match='exact'>
-  <model fallback='allow'>POWER7_v2.3</model>
+  <model fallback='allow'>power7</model>
 </cpu>
diff --git a/tests/cputestdata/ppc64-baseline-no-vendor.xml b/tests/cputestdata/ppc64-baseline-no-vendor.xml
index 5e69a62..6b88977 100644
--- a/tests/cputestdata/ppc64-baseline-no-vendor.xml
+++ b/tests/cputestdata/ppc64-baseline-no-vendor.xml
@@ -1,7 +1,7 @@
 <cpuTest>
 <cpu>
   <arch>ppc64</arch>
-  <model>POWER7_v2.3</model>
+  <model>power7</model>
   <topology sockets='2' cores='4' threads='1'/>
 </cpu>
 </cpuTest>
diff --git a/tests/cputestdata/ppc64-exact.xml b/tests/cputestdata/ppc64-exact.xml
index c84f16a..76900e8 100644
--- a/tests/cputestdata/ppc64-exact.xml
+++ b/tests/cputestdata/ppc64-exact.xml
@@ -1,3 +1,3 @@
 <cpu match='exact'>
-  <model>POWER8_v1.0</model>
+  <model>power6</model>
 </cpu>
diff --git a/tests/cputestdata/ppc64-guest-nofallback.xml b/tests/cputestdata/ppc64-guest-nofallback.xml
index 42026b4..5539cfa 100644
--- a/tests/cputestdata/ppc64-guest-nofallback.xml
+++ b/tests/cputestdata/ppc64-guest-nofallback.xml
@@ -1,4 +1,4 @@
 <cpu match='exact'>
-  <model fallback='forbid'>POWER7_v2.1</model>
+  <model fallback='forbid'>power7</model>
   <topology sockets='2' cores='4' threads='1'/>
 </cpu>
diff --git a/tests/cputestdata/ppc64-guest.xml b/tests/cputestdata/ppc64-guest.xml
index ac81ec0..967ad5a 100644
--- a/tests/cputestdata/ppc64-guest.xml
+++ b/tests/cputestdata/ppc64-guest.xml
@@ -1,4 +1,4 @@
 <cpu match='exact'>
-  <model>POWER8_v1.0</model>
+  <model>power7</model>
   <topology sockets='2' cores='4' threads='1'/>
 </cpu>
diff --git a/tests/cputestdata/ppc64-host+guest,ppc_models-result.xml b/tests/cputestdata/ppc64-host+guest,ppc_models-result.xml
index 0cb0830..42e7bae 100644
--- a/tests/cputestdata/ppc64-host+guest,ppc_models-result.xml
+++ b/tests/cputestdata/ppc64-host+guest,ppc_models-result.xml
@@ -1,5 +1,5 @@
 <cpu mode='custom' match='exact'>
   <arch>ppc64</arch>
-  <model fallback='allow'>POWER8_v1.0</model>
+  <model fallback='allow'>power7</model>
   <vendor>IBM</vendor>
 </cpu>
diff --git a/tests/cputestdata/ppc64-host+guest-nofallback,ppc_models,POWER7_v2.1-result.xml b/tests/cputestdata/ppc64-host+guest-nofallback,ppc_models,POWER7_v2.1-result.xml
deleted file mode 100644
index 7e58361..0000000
--- a/tests/cputestdata/ppc64-host+guest-nofallback,ppc_models,POWER7_v2.1-result.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<cpu mode='custom' match='exact'>
-  <arch>ppc64</arch>
-  <model fallback='forbid'>POWER7_v2.1</model>
-  <vendor>IBM</vendor>
-</cpu>
diff --git a/tests/cputestdata/ppc64-host+guest-nofallback,ppc_models,power7-result.xml b/tests/cputestdata/ppc64-host+guest-nofallback,ppc_models,power7-result.xml
new file mode 100644
index 0000000..1f2711a
--- /dev/null
+++ b/tests/cputestdata/ppc64-host+guest-nofallback,ppc_models,power7-result.xml
@@ -0,0 +1,5 @@
+<cpu mode='custom' match='exact'>
+  <arch>ppc64</arch>
+  <model fallback='forbid'>power7</model>
+  <vendor>IBM</vendor>
+</cpu>
diff --git a/tests/cputestdata/ppc64-host.xml b/tests/cputestdata/ppc64-host.xml
index 39cb741..56d3d8f 100644
--- a/tests/cputestdata/ppc64-host.xml
+++ b/tests/cputestdata/ppc64-host.xml
@@ -1,6 +1,6 @@
 <cpu>
   <arch>ppc64</arch>
-  <model>POWER7_v2.3</model>
+  <model>power7</model>
   <vendor>IBM</vendor>
   <topology sockets='1' cores='64' threads='1'/>
 </cpu>
diff --git a/tests/cputestdata/ppc64-strict.xml b/tests/cputestdata/ppc64-strict.xml
index e91c6e7..a507e32 100644
--- a/tests/cputestdata/ppc64-strict.xml
+++ b/tests/cputestdata/ppc64-strict.xml
@@ -1,3 +1,3 @@
 <cpu match='exact'>
-  <model>POWER7_v2.3</model>
+  <model>power7</model>
 </cpu>
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.args
index 9927294..df38ab6 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.args
@@ -1,5 +1,6 @@
 LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \
-QEMU_AUDIO_DRV=none /usr/bin/qemu-system-ppc64 -S -M pseries -cpu POWER7_v2.3 \
+QEMU_AUDIO_DRV=none /usr/bin/qemu-system-ppc64 -S -M pseries \
+-cpu host,compat=power6 \
 -m 512 -smp 1 -nographic -nodefconfig -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \
 -mon chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c -usb \
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.xml b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.xml
index b54dae2..44cf506 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.xml
@@ -7,7 +7,7 @@
     <type arch='ppc64' machine='pseries'>hvm</type>
   </os>
   <cpu match='exact'>
-    <model>POWER7_v2.3</model>
+    <model fallback='compat'>power6</model>
     <vendor>IBM</vendor>
   </cpu>
   <clock offset='utc'/>
-- 
1.8.3.1

-- 
Prerna Saxena

Linux Technology Centre,
IBM Systems and Technology Lab,
Bangalore, India

More information about the libvir-list mailing list