On Wed, Nov 16, 2016 at 09:39:31AM +0100, Thomas Huth wrote: > 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 <th...@redhat.com>
Applied to ppc-for-2.8.
Longer term, I think we should default to tcg for all these tests - on
x86 as well - then run KVM *as well* when available. But in the short
term we should fix make check for the 2.8 release.
> ---
> 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();
> }
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
