diff --git a/tests/cputest.c b/tests/cputest.c
index 959cb9fdc4..408a510429 100644
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -493,6 +493,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 int
mymain(void)
@@ -584,6 +585,9 @@ mymain(void)
DO_TEST_COMPARE("x86", "host-worse", "nehalem-force", VIR_CPU_COMPARE_IDENTICAL);
DO_TEST_COMPARE("x86", "host-SandyBridge", "exact-force-Haswell", VIR_CPU_COMPARE_IDENTICAL);
+ DO_TEST_COMPARE("ppc64", "host", "strict", VIR_CPU_COMPARE_IDENTICAL);
+ DO_TEST_COMPARE("ppc64", "host", "exact", VIR_CPU_COMPARE_INCOMPATIBLE);
+
/* guest updates for migration
* automatically compares host CPU with the result */
DO_TEST_UPDATE("x86", "host", "min", VIR_CPU_COMPARE_IDENTICAL);
@@ -601,6 +605,8 @@ mymain(void)
DO_TEST_BASELINE("x86", "2", 0, 0);
DO_TEST_BASELINE("x86", "3", VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES, 0);
+ DO_TEST_BASELINE("ppc64", "incompatible-vendors", 0, -1);
+ DO_TEST_BASELINE("ppc64", "no-vendor", 0, 0);
/* CPU features */
DO_TEST_HASFEATURE("x86", "host", "vmx", YES);
DO_TEST_HASFEATURE("x86", "host", "lm", YES);
@@ -627,6 +633,9 @@ mymain(void)
DO_TEST_GUESTDATA("x86", "host", "host+host-model-nofallback",
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);
+
VIR_FREE(map);
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
new file mode 100644
index 0000000000..cbdd9bc374
--- /dev/null
+++ b/tests/cputestdata/ppc64-baseline-1-result.xml
@@ -0,0 +1,3 @@
+
+ POWER7+_v2.1
+
diff --git a/tests/cputestdata/ppc64-baseline-incompatible-vendors.xml b/tests/cputestdata/ppc64-baseline-incompatible-vendors.xml
new file mode 100644
index 0000000000..97d3c9c084
--- /dev/null
+++ b/tests/cputestdata/ppc64-baseline-incompatible-vendors.xml
@@ -0,0 +1,14 @@
+
+
+ ppc64
+ POWER7+_v2.1
+ Intel
+
+
+
+ ppc64
+ POWER8_v1.0
+ Intel
+
+
+
diff --git a/tests/cputestdata/ppc64-baseline-no-vendor-result.xml b/tests/cputestdata/ppc64-baseline-no-vendor-result.xml
new file mode 100644
index 0000000000..36bae52508
--- /dev/null
+++ b/tests/cputestdata/ppc64-baseline-no-vendor-result.xml
@@ -0,0 +1,3 @@
+
+ POWER7_v2.3
+
diff --git a/tests/cputestdata/ppc64-baseline-no-vendor.xml b/tests/cputestdata/ppc64-baseline-no-vendor.xml
new file mode 100644
index 0000000000..5e69a62404
--- /dev/null
+++ b/tests/cputestdata/ppc64-baseline-no-vendor.xml
@@ -0,0 +1,7 @@
+
+
+ ppc64
+ POWER7_v2.3
+
+
+
diff --git a/tests/cputestdata/ppc64-exact.xml b/tests/cputestdata/ppc64-exact.xml
new file mode 100644
index 0000000000..c84f16a5dc
--- /dev/null
+++ b/tests/cputestdata/ppc64-exact.xml
@@ -0,0 +1,3 @@
+
+ POWER8_v1.0
+
diff --git a/tests/cputestdata/ppc64-guest-nofallback.xml b/tests/cputestdata/ppc64-guest-nofallback.xml
new file mode 100644
index 0000000000..42026b47dd
--- /dev/null
+++ b/tests/cputestdata/ppc64-guest-nofallback.xml
@@ -0,0 +1,4 @@
+
+ POWER7_v2.1
+
+
diff --git a/tests/cputestdata/ppc64-guest.xml b/tests/cputestdata/ppc64-guest.xml
new file mode 100644
index 0000000000..ac81ec0adc
--- /dev/null
+++ b/tests/cputestdata/ppc64-guest.xml
@@ -0,0 +1,4 @@
+
+ POWER8_v1.0
+
+
diff --git a/tests/cputestdata/ppc64-host+guest,ppc_models-result.xml b/tests/cputestdata/ppc64-host+guest,ppc_models-result.xml
new file mode 100644
index 0000000000..0cb0830324
--- /dev/null
+++ b/tests/cputestdata/ppc64-host+guest,ppc_models-result.xml
@@ -0,0 +1,5 @@
+
+ ppc64
+ POWER8_v1.0
+ IBM
+
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
new file mode 100644
index 0000000000..7e58361712
--- /dev/null
+++ b/tests/cputestdata/ppc64-host+guest-nofallback,ppc_models,POWER7_v2.1-result.xml
@@ -0,0 +1,5 @@
+
+ ppc64
+ POWER7_v2.1
+ IBM
+
diff --git a/tests/cputestdata/ppc64-host.xml b/tests/cputestdata/ppc64-host.xml
new file mode 100644
index 0000000000..39cb7414dc
--- /dev/null
+++ b/tests/cputestdata/ppc64-host.xml
@@ -0,0 +1,6 @@
+
+ ppc64
+ POWER7_v2.3
+ IBM
+
+
diff --git a/tests/cputestdata/ppc64-strict.xml b/tests/cputestdata/ppc64-strict.xml
new file mode 100644
index 0000000000..e91c6e7cb2
--- /dev/null
+++ b/tests/cputestdata/ppc64-strict.xml
@@ -0,0 +1,3 @@
+
+ POWER7_v2.3
+
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.args
new file mode 100644
index 0000000000..1e0968068a
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.args
@@ -0,0 +1,7 @@
+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \
+/usr/bin/qemu-system-ppc64 -S -M pseries -cpu POWER7_v2.3 -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 \
+-chardev pty,id=charserial0 \
+-device spapr-vty,chardev=charserial0,reg=0x30000000
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.xml b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.xml
new file mode 100644
index 0000000000..b54dae2547
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.xml
@@ -0,0 +1,21 @@
+
+ QEMUGuest1
+ 1ccfd97d-5eb4-478a-bbe6-88d254c16db7
+ 524288
+ 1
+
+ hvm
+
+
+ POWER7_v2.3
+ IBM
+
+
+
+ /usr/bin/qemu-system-ppc64
+
+
+
+
+
+
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index c21aca9f23..15d3095942 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -954,6 +954,7 @@ mymain(void)
DO_TEST_ERROR("pseries-vio-address-clash", QEMU_CAPS_DRIVE,
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
DO_TEST("pseries-nvram", QEMU_CAPS_DEVICE_NVRAM);
+ DO_TEST_FAILURE("pseries-cpu-exact", QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
DO_TEST("disk-ide-drive-split",
QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
QEMU_CAPS_IDE_CD);