From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59069) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDIkE-0000yJ-70 for qemu-devel@nongnu.org; Mon, 19 Jan 2015 15:16:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YDIkD-0006l3-As for qemu-devel@nongnu.org; Mon, 19 Jan 2015 15:16:18 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43088) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDIkD-0006kq-33 for qemu-devel@nongnu.org; Mon, 19 Jan 2015 15:16:17 -0500 From: John Snow Date: Mon, 19 Jan 2015 15:15:52 -0500 Message-Id: <1421698563-6977-5-git-send-email-jsnow@redhat.com> In-Reply-To: <1421698563-6977-1-git-send-email-jsnow@redhat.com> References: <1421698563-6977-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PATCH v2 04/15] libqos: add qtest_vboot List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, marc.mari.barcelo@gmail.com, armbru@redhat.com, mreitz@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, jsnow@redhat.com Add a va_list variant of the qtest_boot function. Signed-off-by: John Snow Reviewed-by: Paolo Bonzini --- tests/libqos/libqos.c | 25 +++++++++++++++++++------ 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); + struct QOSState *qs = g_malloc(sizeof(QOSState)); + cmdline = g_strdup_vprintf(cmdline_fmt, ap); - va_end(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); -- 1.9.3