diff options
| author | Eric Blake <eblake@redhat.com> | 2017-10-18 16:20:27 +0200 |
|---|---|---|
| committer | Cornelia Huck <cohuck@redhat.com> | 2017-10-20 13:32:10 +0200 |
| commit | 78b27bade1faf91435eae4bdcb7444dcf35f44bf (patch) | |
| tree | e833f418341a11b9739ec254339cf1ed5b2db802 /tests/prom-env-test.c | |
| parent | 6bb6f19473e2f28334bed14740d64afb6cb6a4e5 (diff) | |
| download | qemu-78b27bade1faf91435eae4bdcb7444dcf35f44bf.zip qemu-78b27bade1faf91435eae4bdcb7444dcf35f44bf.tar.gz qemu-78b27bade1faf91435eae4bdcb7444dcf35f44bf.tar.bz2 | |
libqtest: Add qtest_[v]startf()
We have several callers that were formatting the argument strings
themselves; consolidate this effort by adding new convenience
functions directly in libqtest, and update some call-sites that
can benefit from it.
Note that the new functions qtest_startf() and qtest_vstartf()
behave more like qtest_init() (the caller must assign global_qtest
after the fact, rather than getting it implicitly set). This helps
us prepare for future patches that get rid of the global variable,
by explicitly highlighting which tests still depend on it now.
Signed-off-by: Eric Blake <eblake@redhat.com>
[thuth: Dropped the hunks that do not apply cleanly to qemu master
yet and added the missing g_free(args) in qtest_vstartf()]
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <1508336428-20511-2-git-send-email-thuth@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Diffstat (limited to 'tests/prom-env-test.c')
| -rw-r--r-- | tests/prom-env-test.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/tests/prom-env-test.c b/tests/prom-env-test.c index bc8b616..8c867e6 100644 --- a/tests/prom-env-test.c +++ b/tests/prom-env-test.c @@ -44,21 +44,18 @@ static void check_guest_memory(void) static void test_machine(const void *machine) { - char *args; const char *extra_args; /* 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); + global_qtest = qtest_startf("-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); - - g_free(args); } static void add_tests(const char *machines[]) |