OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

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>
This commit is contained in:
Thomas Huth 2018-11-19 16:05:29 +01:00
parent ed398a1206
commit dc4c158722
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/prom-env-test.c
View File

@ -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[])