motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-09 18:44:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Thomas Huth 2016-11-16 09:39:31 +01:00 • committed by David Gibson
parent 00227fefd2
commit 171da9d5db
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tests/postcopy-test.c
View file

@ -380,17 +380,21 @@ static void test_migrate(void)
" -incoming %s", " -incoming %s",
tmpfs, bootpath, uri); tmpfs, bootpath, uri);
} else if (strcmp(arch, "ppc64") == 0) { } 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); 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" " -name pcsource,debug-threads=on"
" -serial file:%s/src_serial" " -serial file:%s/src_serial"
" -drive file=%s,if=pflash,format=raw", " -drive file=%s,if=pflash,format=raw",
tmpfs, bootpath); accel, tmpfs, bootpath);
cmd_dst = g_strdup_printf("-machine accel=kvm:tcg -m 256M" cmd_dst = g_strdup_printf("-machine accel=%s -m 256M"
" -name pcdest,debug-threads=on" " -name pcdest,debug-threads=on"
" -serial file:%s/dest_serial" " -serial file:%s/dest_serial"
" -incoming %s", " -incoming %s",
tmpfs, uri); accel, tmpfs, uri);
} else { } else {
g_assert_not_reached(); g_assert_not_reached();
} }