system/qemu
system/qemu
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/qemu synced 2024-11-05 20:35:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

tests/prom-env: Ease time-out problems on slow hosts

Browse source 
Peter Maydell recently ran into time-out problems with the
prom-env test on a rather slow ARM board. To tackle this issue,
we can speed up the test by running QEMU with "-nodefaults" for
the pseries machine, so that SLOF has less devices to scan during
boot, and by using the "nvramrc" environment variable instead of
"boot-command", since this variable is evaluated earlier in the
boot process.
And to be really sure that we do not face such time out problems
again, let's also increase the time out value from 100s to 120s
instead.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-id: 1486739699-1076-1-git-send-email-thuth@redhat.com
Tested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Thomas Huth 2017-02-10 16:14:59 +01:00 committed by Peter Maydell
parent 33d076ebd0
commit 61eedf7aec
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tests/prom-env-test.c
View file

@ -30,8 +30,8 @@ static void check_guest_memory(void)
uint32_t signature;
int i;
/* Poll until code has run and modified memory. Wait at most 30 seconds */
for (i = 0; i < 10000; ++i) {
/* Poll until code has run and modified memory. Wait at most 120 seconds */
for (i = 0; i < 12000; ++i) {
signature = readl(ADDRESS);
if (signature == MAGIC) {
break;
@ -45,9 +45,14 @@ static void check_guest_memory(void)
static void test_machine(const void *machine)
{
char *args;
const char *extra_args;
args = g_strdup_printf("-M %s,accel=tcg -prom-env 'boot-command=%x %x l!'",
(const char *)machine, MAGIC, ADDRESS);
/* The pseries firmware boots much faster without the default devices */
extra_args = strcmp(machine, "pseries") == 0 ? "-nodefaults" : "";
args = g_strdup_printf("-M %s,accel=tcg %s -prom-env 'use-nvramrc?=true' "
"-prom-env 'nvramrc=%x %x l!' ",
(const char *)machine, extra_args, MAGIC, ADDRESS);
qtest_start(args);
check_guest_memory();