From patchwork Tue Jan 13 03:34:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Snow X-Patchwork-Id: 428236 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 881C914010F for ; Tue, 13 Jan 2015 14:37:55 +1100 (AEDT) Received: from localhost ([::1]:37224 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YAsIj-0003Gz-FZ for incoming@patchwork.ozlabs.org; Mon, 12 Jan 2015 22:37:53 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41783) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YAsG8-0007R9-D2 for qemu-devel@nongnu.org; Mon, 12 Jan 2015 22:35:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YAsG7-0004oI-Ep for qemu-devel@nongnu.org; Mon, 12 Jan 2015 22:35:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52325) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YAsG7-0004o6-6F for qemu-devel@nongnu.org; Mon, 12 Jan 2015 22:35:11 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t0D3Z9Wf022874 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 12 Jan 2015 22:35:09 -0500 Received: from scv.usersys.redhat.com (vpn-56-104.rdu2.redhat.com [10.10.56.104]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t0D3YxBc003382; Mon, 12 Jan 2015 22:35:07 -0500 From: John Snow To: qemu-devel@nongnu.org Date: Mon, 12 Jan 2015 22:34:29 -0500 Message-Id: <1421120079-987-5-git-send-email-jsnow@redhat.com> In-Reply-To: <1421120079-987-1-git-send-email-jsnow@redhat.com> References: <1421120079-987-1-git-send-email-jsnow@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, marc.mari.barcelo@gmail.com, armbru@redhat.com, mreitz@redhat.com, stefanha@redhat.com, John Snow Subject: [Qemu-devel] [PATCH 04/14] libqos: add qtest_vboot X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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);