[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 07/65] libqos: add qtest_vboot
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL v2 07/65] libqos: add qtest_vboot |
Date: |
Mon, 16 Feb 2015 15:45:32 +0000 |
From: John Snow <address@hidden>
Add a va_list variant of the qtest_boot function.
Signed-off-by: John Snow <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
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);
- 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);
--
2.1.0
- [Qemu-devel] [PULL v2 00/65] Block patches, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 03/65] iotests: Add test for drive-mirror with NBD target, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 01/65] nbd: Drop BDS backpointer, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 04/65] libqos: Split apart pc_alloc_init, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 02/65] iotests: Add "wait" functionality to _cleanup_qemu, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 06/65] libqos: create libqos.c, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 08/65] libqos: add alloc_init_flags, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 07/65] libqos: add qtest_vboot,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL v2 05/65] qtest/ahci: Create ahci.h, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 09/65] libqos: Update QGuestAllocator to be opaque, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 10/65] libqos: add pc specific interface, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 12/65] qtest/ahci: finalize AHCIQState consolidation, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 15/65] libqos/ahci: Functional register helpers, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 11/65] qtest/ahci: Store hba_base in AHCIQState, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 13/65] qtest/ahci: remove pcibus global, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 16/65] qtest/ahci: remove getter/setter macros, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 17/65] qtest/ahci: Bookmark FB and CLB pointers, Stefan Hajnoczi, 2015/02/16
- [Qemu-devel] [PULL v2 14/65] qtest/ahci: remove guest_malloc global, Stefan Hajnoczi, 2015/02/16