qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH] tests/postcopy: Use KVM on ppc64 only if it is KVM-HV
@ 2016-11-16  8:39 Thomas Huth
  2016-11-16  9:19 ` Laurent Vivier
                   ` (4 more replies)
  0 siblings, 5 replies; 16+ messages in thread
From: Thomas Huth @ 2016-11-16  8:39 UTC (permalink / raw)
  To: David Gibson, qemu-ppc, Laurent Vivier, Dr. David Alan Gilbert,
	Stefan Hajnoczi
  Cc: qemu-devel, Andrea Arcangeli, Greg Kurz, Eric Blake

The ppc64 postcopy test does not work with KVM-PR, and it is also
causing annoying warning messages when run on a x86 host. So let's
use KVM here only if we know that we're running with KVM-HV (which
automatically also means that we're running on a ppc64 host), and
fall back to TCG otherwise.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/postcopy-test.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tests/postcopy-test.c b/tests/postcopy-test.c
index d6613c5..dafe8be 100644
--- a/tests/postcopy-test.c
+++ b/tests/postcopy-test.c
@@ -380,17 +380,21 @@ static void test_migrate(void)
                                   " -incoming %s",
                                   tmpfs, bootpath, uri);
     } else if (strcmp(arch, "ppc64") == 0) {
+        const char *accel;
+
+        /* On ppc64, the test only works with kvm-hv, but not with kvm-pr */
+        accel = access("/sys/module/kvm_hv", F_OK) ? "tcg" : "kvm:tcg";
         init_bootfile_ppc(bootpath);
-        cmd_src = g_strdup_printf("-machine accel=kvm:tcg -m 256M"
+        cmd_src = g_strdup_printf("-machine accel=%s -m 256M"
                                   " -name pcsource,debug-threads=on"
                                   " -serial file:%s/src_serial"
                                   " -drive file=%s,if=pflash,format=raw",
-                                  tmpfs, bootpath);
-        cmd_dst = g_strdup_printf("-machine accel=kvm:tcg -m 256M"
+                                  accel, tmpfs, bootpath);
+        cmd_dst = g_strdup_printf("-machine accel=%s -m 256M"
                                   " -name pcdest,debug-threads=on"
                                   " -serial file:%s/dest_serial"
                                   " -incoming %s",
-                                  tmpfs, uri);
+                                  accel, tmpfs, uri);
     } else {
         g_assert_not_reached();
     }
-- 
1.8.3.1

^ permalink raw reply related	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2016-11-18 13:03 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-16  8:39 [Qemu-devel] [PATCH] tests/postcopy: Use KVM on ppc64 only if it is KVM-HV Thomas Huth
2016-11-16  9:19 ` Laurent Vivier
2016-11-16  9:43   ` Thomas Huth
2016-11-16 10:37 ` Laurent Vivier
2016-11-16 12:13 ` Greg Kurz
2016-11-16 12:24   ` Dr. David Alan Gilbert
2016-11-16 12:37     ` Greg Kurz
2016-11-16 13:17       ` Thomas Huth
2016-11-16 14:17         ` Greg Kurz
2016-11-17 20:22           ` Laurent Vivier
2016-11-18 12:53             ` Greg Kurz
2016-11-18 13:03               ` Laurent Vivier
2016-11-17  3:13         ` David Gibson
2016-11-16 14:18 ` Greg Kurz
2016-11-17  3:18 ` [Qemu-devel] [Qemu-ppc] " David Gibson
2016-11-17  7:46   ` Laurent Vivier

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).