diff options
author | John Snow <jsnow@redhat.com> | 2015-01-19 15:15:52 -0500 |
---|---|---|
committer | Stefan Hajnoczi <stefanha@redhat.com> | 2015-02-16 14:36:03 +0000 |
commit | f1518d1192a1a9387f881919897fbb0101ad3426 (patch) | |
tree | d73b84131d94f7f90d248a8c19485ba57cef36d8 /tests/libqos | |
parent | dd0029c0f44d5121c64a02d3aa0440283fb72fcd (diff) | |
download | qemu-f1518d1192a1a9387f881919897fbb0101ad3426.zip qemu-f1518d1192a1a9387f881919897fbb0101ad3426.tar.gz qemu-f1518d1192a1a9387f881919897fbb0101ad3426.tar.bz2 |
libqos: add qtest_vboot
Add a va_list variant of the qtest_boot function.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1421698563-6977-5-git-send-email-jsnow@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'tests/libqos')
-rw-r--r-- | tests/libqos/libqos.c | 25 | ||||
-rw-r--r-- | tests/libqos/libqos.h | 1 |
2 files changed, 20 insertions, 6 deletions
diff --git a/tests/libqos/libqos.c b/tests/libqos/libqos.c index c478bc9..c8b3ef0 100644 --- a/tests/libqos/libqos.c +++ b/tests/libqos/libqos.c @@ -16,16 +16,13 @@ * Launch QEMU with the given command line, * and then set up interrupts and our guest malloc interface. */ -QOSState *qtest_boot(const char *cmdline_fmt, ...) +QOSState *qtest_vboot(const char *cmdline_fmt, va_list ap) { - QOSState *qs = g_malloc(sizeof(QOSState)); char *cmdline; - va_list ap; - va_start(ap, cmdline_fmt); - cmdline = g_strdup_vprintf(cmdline_fmt, ap); - va_end(ap); + struct QOSState *qs = g_malloc(sizeof(QOSState)); + cmdline = g_strdup_vprintf(cmdline_fmt, ap); qs->qts = qtest_start(cmdline); qtest_irq_intercept_in(global_qtest, "ioapic"); qs->alloc = pc_alloc_init(); @@ -35,6 +32,22 @@ QOSState *qtest_boot(const char *cmdline_fmt, ...) } /** + * Launch QEMU with the given command line, + * and then set up interrupts and our guest malloc interface. + */ +QOSState *qtest_boot(const char *cmdline_fmt, ...) +{ + QOSState *qs; + va_list ap; + + va_start(ap, cmdline_fmt); + qs = qtest_vboot(cmdline_fmt, ap); + va_end(ap); + + return qs; +} + +/** * Tear down the QEMU instance. */ void qtest_shutdown(QOSState *qs) diff --git a/tests/libqos/libqos.h b/tests/libqos/libqos.h index 7a106f2..7ae0a8d 100644 --- a/tests/libqos/libqos.h +++ b/tests/libqos/libqos.h @@ -10,6 +10,7 @@ typedef struct QOSState { QGuestAllocator *alloc; } QOSState; +QOSState *qtest_vboot(const char *cmdline_fmt, va_list ap); QOSState *qtest_boot(const char *cmdline_fmt, ...); void qtest_shutdown(QOSState *qs); |