Commit 171da9d5 authored by Thomas Huth's avatar Thomas Huth Committed by David Gibson
Browse files

tests/postcopy: Use KVM on ppc64 only if it is KVM-HV 



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: default avatarThomas Huth <thuth@redhat.com>
Reviewed-by: default avatarLaurent Vivier <lvivier@redhat.com>
Reviewed-by: default avatarGreg Kurz <groug@kaod.org>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 00227fef

tests/postcopy-test.c

+8 −4
Original line number Diff line number Diff line
@@ -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();

    }