From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45763) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDFhR-0006iL-Nd for qemu-devel@nongnu.org; Mon, 19 Jan 2015 12:01:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YDFhM-0003hK-LJ for qemu-devel@nongnu.org; Mon, 19 Jan 2015 12:01:13 -0500 Received: from mail-we0-x234.google.com ([2a00:1450:400c:c03::234]:58118) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDFhM-0003hC-Ez for qemu-devel@nongnu.org; Mon, 19 Jan 2015 12:01:08 -0500 Received: by mail-we0-f180.google.com with SMTP id m14so7312857wev.11 for ; Mon, 19 Jan 2015 09:01:07 -0800 (PST) Sender: Paolo Bonzini Message-ID: <54BD384F.7060002@redhat.com> Date: Mon, 19 Jan 2015 18:01:03 +0100 From: Paolo Bonzini MIME-Version: 1.0 References: <1421120079-987-1-git-send-email-jsnow@redhat.com> <1421120079-987-5-git-send-email-jsnow@redhat.com> In-Reply-To: <1421120079-987-5-git-send-email-jsnow@redhat.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 04/14] libqos: add qtest_vboot List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: John Snow , qemu-devel@nongnu.org Cc: kwolf@redhat.com, marc.mari.barcelo@gmail.com, armbru@redhat.com, stefanha@redhat.com, mreitz@redhat.com On 13/01/2015 04:34, John Snow wrote: > Add a va_list variant of the qtest_boot function. > > Signed-off-by: John Snow > --- > 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); > > Reviewed-by: Paolo Bonzini