diff options
| author | Thomas Huth <thuth@redhat.com> | 2018-11-19 16:05:29 +0100 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2018-12-17 15:36:40 +0100 |
| commit | dc4c1587223d8d5eb60a8ad2c465839545674442 (patch) | |
| tree | a0e23e6c9eb2e77dcff7e29fe122d49c1a03d81f | |
| parent | ed398a1206035c082bf9553cb627f4c6c6b5b5c1 (diff) | |
| download | qemu-dc4c1587223d8d5eb60a8ad2c465839545674442.zip qemu-dc4c1587223d8d5eb60a8ad2c465839545674442.tar.gz qemu-dc4c1587223d8d5eb60a8ad2c465839545674442.tar.bz2 | |
tests/prom-env: Make test independent of global_qtest
global_qtest is only needed here for one readl(). Let's replace it
with qtest_readl() and we can remove the global_qtest variable here.
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
| -rw-r--r-- | tests/prom-env-test.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/tests/prom-env-test.c b/tests/prom-env-test.c index 198d007..4821254 100644 --- a/tests/prom-env-test.c +++ b/tests/prom-env-test.c @@ -25,14 +25,14 @@ #define MAGIC 0xcafec0de #define ADDRESS 0x4000 -static void check_guest_memory(void) +static void check_guest_memory(QTestState *qts) { uint32_t signature; int i; /* Poll until code has run and modified memory. Wait at most 600 seconds */ for (i = 0; i < 60000; ++i) { - signature = readl(ADDRESS); + signature = qtest_readl(qts, ADDRESS); if (signature == MAGIC) { break; } @@ -45,17 +45,16 @@ static void check_guest_memory(void) static void test_machine(const void *machine) { const char *extra_args; + QTestState *qts; /* The pseries firmware boots much faster without the default devices */ extra_args = strcmp(machine, "pseries") == 0 ? "-nodefaults" : ""; - global_qtest = qtest_initf("-M %s,accel=tcg %s " - "-prom-env 'use-nvramrc?=true' " - "-prom-env 'nvramrc=%x %x l!' ", - (const char *)machine, extra_args, - MAGIC, ADDRESS); - check_guest_memory(); - qtest_quit(global_qtest); + qts = qtest_initf("-M %s,accel=tcg %s -prom-env 'use-nvramrc?=true' " + "-prom-env 'nvramrc=%x %x l!' ", (const char *)machine, + extra_args, MAGIC, ADDRESS); + check_guest_memory(qts); + qtest_quit(qts); } static void add_tests(const char *machines[]) |