diff options
author | Laurent Vivier <lvivier@redhat.com> | 2020-01-07 17:34:37 +0100 |
---|---|---|
committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2020-06-22 12:44:54 -0500 |
commit | e8a286010c4dc5f3965c80d5c66e71bc69e762bf (patch) | |
tree | 091780da66860b23d84db89cc4cd8cc2f5f5e0f7 | |
parent | 9a30621d3d5de76f865dc804a1dd16cc517461b6 (diff) | |
download | qemu-e8a286010c4dc5f3965c80d5c66e71bc69e762bf.zip qemu-e8a286010c4dc5f3965c80d5c66e71bc69e762bf.tar.gz qemu-e8a286010c4dc5f3965c80d5c66e71bc69e762bf.tar.bz2 |
migration-test: ppc64: fix FORTH test program
Commit e51e711b1bef has moved the initialization of start_address and
end_address after the definition of the command line argument,
where the nvramrc is initialized, and thus the loop is between 0 and 0
rather than 1 MiB and 100 MiB.
It doesn't affect the result of the test if all the tests are run in
sequence because the two first tests don't run the loop, so the
values are correctly initialized when we actually need them.
But it hangs when we ask to run only one test, for instance:
QTEST_QEMU_BINARY=ppc64-softmmu/qemu-system-ppc64 \
tests/migration-test -m=quick -p /ppc64/migration/validate_uuid_error
Fixes: e51e711b1bef ("tests/migration: Add migration-test header file")
Cc: wei@redhat.com
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Message-Id: <20200107163437.52139-1-lvivier@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Thomas Huth <thuth@redhat.com>
(cherry picked from commit 16c5c6928ff53bd95e6504301ef6c285501531e7)
Conflicts:
tests/migration-test.c
*drop context dep. on 68d95609
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
-rw-r--r-- | tests/migration-test.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/migration-test.c b/tests/migration-test.c index ebd77a5..df51017 100644 --- a/tests/migration-test.c +++ b/tests/migration-test.c @@ -614,6 +614,8 @@ 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; + start_address = PPC_TEST_MEM_START; + end_address = PPC_TEST_MEM_END; cmd_src = g_strdup_printf("-machine accel=%s,vsmt=8 -m 256M -nodefaults" " -name source,debug-threads=on" " -serial file:%s/src_serial" @@ -629,9 +631,6 @@ static int test_migrate_start(QTestState **from, QTestState **to, " -incoming %s %s %s", accel, tmpfs, uri, extra_opts ? extra_opts : "", opts_dst); - - start_address = PPC_TEST_MEM_START; - end_address = PPC_TEST_MEM_END; } else if (strcmp(arch, "aarch64") == 0) { init_bootfile(bootpath, aarch64_kernel, sizeof(aarch64_kernel)); extra_opts = use_shmem ? get_shmem_opts("150M", shmem_path) : NULL; |