[kvm-unit-tests PATCH 1/2] s390x: diag10: Fence tcg and pv environments

[Janosch Frank <frankja@linux.ibm.com>]

Diag10 isn't supported under either of these environments so let's
make sure that the test bails out accordingly.

Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
---
 s390x/diag10.c      | 15 +++++++++++++++
 s390x/unittests.cfg |  1 +
 2 files changed, 16 insertions(+)

diff --git a/s390x/diag10.c b/s390x/diag10.c
index 579a7a5d..00725f58 100644
--- a/s390x/diag10.c
+++ b/s390x/diag10.c
@@ -9,6 +9,8 @@
  */
 
 #include <libcflat.h>
+#include <uv.h>
+#include <hardware.h>
 #include <asm/asm-offsets.h>
 #include <asm/interrupt.h>
 #include <asm/page.h>
@@ -95,8 +97,21 @@ static void test_priv(void)
 int main(void)
 {
 	report_prefix_push("diag10");
+
+	if (host_is_tcg()) {
+		report_skip("Test unsupported under TCG");
+		goto out;
+	}
+	if (uv_os_is_guest()) {
+		report_skip("Test unsupported under PV");
+		goto out;
+	}
+
 	test_prefix();
 	test_params();
 	test_priv();
+
+out:
+	report_prefix_pop();
 	return report_summary();
 }
diff --git a/s390x/unittests.cfg b/s390x/unittests.cfg
index a9af6680..9c43ab2f 100644
--- a/s390x/unittests.cfg
+++ b/s390x/unittests.cfg
@@ -51,6 +51,7 @@ extra_params = -device virtio-net-ccw
 
 [diag10]
 file = diag10.elf
+accel = kvm
 
 [diag308]
 file = diag308.elf
-- 
2.48.1