On Wed, Nov 20, 2019 at 03:25:39PM +0100, Laurent Vivier wrote:
> Commit 29cb4187497d ("spapr: Set VSMT to smp_threads by default")
> has introduced a new default value for VSMT that is not supported
> by old kernels (before 4.13 kernel) and this breaks "make check"
> on these kernels.
>
> To fix that, explicitly set in the involved tests the value that was
> used as the default value before the change.
>
> Cc: Greg Kurz <gr...@kaod.org>
> Signed-off-by: Laurent Vivier <lviv...@redhat.com>
Applied to ppc-for-4.2, thanks.
> ---
> tests/migration-test.c | 4 ++--
> tests/pxe-test.c | 6 +++---
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/tests/migration-test.c b/tests/migration-test.c
> index ac780dffdaad..ebd77a581aff 100644
> --- a/tests/migration-test.c
> +++ b/tests/migration-test.c
> @@ -614,7 +614,7 @@ static int test_migrate_start(QTestState **from,
> QTestState **to,
> end_address = S390_TEST_MEM_END;
> } else if (strcmp(arch, "ppc64") == 0) {
> extra_opts = use_shmem ? get_shmem_opts("256M", shmem_path) : NULL;
> - cmd_src = g_strdup_printf("-machine accel=%s -m 256M -nodefaults"
> + cmd_src = g_strdup_printf("-machine accel=%s,vsmt=8 -m 256M
> -nodefaults"
> " -name source,debug-threads=on"
> " -serial file:%s/src_serial"
> " -prom-env 'use-nvramrc?=true' -prom-env "
> @@ -623,7 +623,7 @@ static int test_migrate_start(QTestState **from,
> QTestState **to,
> "until' %s %s", accel, tmpfs, end_address,
> start_address, extra_opts ? extra_opts :
> "",
> opts_src);
> - cmd_dst = g_strdup_printf("-machine accel=%s -m 256M"
> + cmd_dst = g_strdup_printf("-machine accel=%s,vsmt=8 -m 256M"
> " -name target,debug-threads=on"
> " -serial file:%s/dest_serial"
> " -incoming %s %s %s",
> diff --git a/tests/pxe-test.c b/tests/pxe-test.c
> index 948b0fbdc727..aaae54f7550d 100644
> --- a/tests/pxe-test.c
> +++ b/tests/pxe-test.c
> @@ -46,15 +46,15 @@ static testdef_t x86_tests_slow[] = {
>
> static testdef_t ppc64_tests[] = {
> { "pseries", "spapr-vlan",
> - "-machine cap-cfpc=broken,cap-sbbc=broken,cap-ibs=broken" },
> + "-machine cap-cfpc=broken,cap-sbbc=broken,cap-ibs=broken,vsmt=8" },
> { "pseries", "virtio-net-pci",
> - "-machine cap-cfpc=broken,cap-sbbc=broken,cap-ibs=broken" },
> + "-machine cap-cfpc=broken,cap-sbbc=broken,cap-ibs=broken,vsmt=8" },
> { NULL },
> };
>
> static testdef_t ppc64_tests_slow[] = {
> { "pseries", "e1000",
> - "-machine cap-cfpc=broken,cap-sbbc=broken,cap-ibs=broken" },
> + "-machine cap-cfpc=broken,cap-sbbc=broken,cap-ibs=broken,vsmt=8" },
> { NULL },
> };
>
--
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
