[Qemu-devel] [PATCH] tests/prom-env: Enable the test for the sun4u machine, too

[Qemu-devel] [PATCH] tests/prom-env: Enable the test for the sun4u machine, too

[Thomas Huth]

The 32-bit TCG bug has been fixed a while ago, so we can enable
this test for sparc64 now, too. Unfortunately, OpenBIOS does not
work with the sun4v machine anymore (it needs to catch up with the
improved emulation), so we can only enable this test for the sun4u
machine right now.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/Makefile.include | 3 +--
 tests/prom-env-test.c  | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/tests/Makefile.include b/tests/Makefile.include
index 634394a..af99696 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -304,8 +304,7 @@ check-qtest-sparc-y = tests/prom-env-test$(EXESUF)
 check-qtest-sparc64-y = tests/endianness-test$(EXESUF)
 #check-qtest-sparc64-y += tests/m48t59-test$(EXESUF)
 #gcov-files-sparc64-y += hw/timer/m48t59.c
-#Disabled for now, triggers a TCG bug on 32-bit hosts
-#check-qtest-sparc64-y += tests/prom-env-test$(EXESUF)
+check-qtest-sparc64-y += tests/prom-env-test$(EXESUF)
 
 check-qtest-arm-y = tests/tmp105-test$(EXESUF)
 check-qtest-arm-y += tests/ds1338-test$(EXESUF)
diff --git a/tests/prom-env-test.c b/tests/prom-env-test.c
index bd33bc3..eac207b 100644
--- a/tests/prom-env-test.c
+++ b/tests/prom-env-test.c
@@ -76,7 +76,7 @@ static void add_tests(const char *machines[])
 int main(int argc, char *argv[])
 {
     const char *sparc_machines[] = { "SPARCbook", "Voyager", "SS-20", NULL };
-    const char *sparc64_machines[] = { "sun4u", "sun4v", NULL };
+    const char *sparc64_machines[] = { "sun4u", NULL };
     const char *ppc_machines[] = { "mac99", "g3beige", NULL };
     const char *ppc64_machines[] = { "mac99", "g3beige", "pseries", NULL };
     const char *arch = qtest_get_arch();
-- 
1.8.3.1

Re: [Qemu-devel] [Qemu-trivial] [PATCH] tests/prom-env: Enable the test for the sun4u machine, too

[Michael Tokarev]

10.02.2017 21:22, Thomas Huth wrote:
> The 32-bit TCG bug has been fixed a while ago, so we can enable
> this test for sparc64 now, too. Unfortunately, OpenBIOS does not
> work with the sun4v machine anymore (it needs to catch up with the
> improved emulation), so we can only enable this test for the sun4u
> machine right now.

Applied to -trivial, thanks!

/mjt