[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 08/65] libqos: add alloc_init_flags
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL v2 08/65] libqos: add alloc_init_flags |
Date: |
Mon, 16 Feb 2015 15:45:33 +0000 |
From: John Snow <address@hidden>
Allow a generic interface to alloc_init_flags,
not just through pc_alloc_init_flags.
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/malloc-pc.c | 4 +---
tests/libqos/malloc.c | 8 ++++++++
tests/libqos/malloc.h | 2 ++
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/tests/libqos/malloc-pc.c b/tests/libqos/malloc-pc.c
index 36a0740..6a5fdf3 100644
--- a/tests/libqos/malloc-pc.c
+++ b/tests/libqos/malloc-pc.c
@@ -37,9 +37,7 @@ QGuestAllocator *pc_alloc_init_flags(QAllocOpts flags)
QFWCFG *fw_cfg = pc_fw_cfg_init();
ram_size = qfw_cfg_get_u64(fw_cfg, FW_CFG_RAM_SIZE);
- s = alloc_init(1 << 20, MIN(ram_size, 0xE0000000));
-
- s->opts = flags;
+ s = alloc_init_flags(flags, 1 << 20, MIN(ram_size, 0xE0000000));
s->page_size = PAGE_SIZE;
/* clean-up */
diff --git a/tests/libqos/malloc.c b/tests/libqos/malloc.c
index 0d34ecd..4ff260f 100644
--- a/tests/libqos/malloc.c
+++ b/tests/libqos/malloc.c
@@ -285,3 +285,11 @@ QGuestAllocator *alloc_init(uint64_t start, uint64_t end)
return s;
}
+
+QGuestAllocator *alloc_init_flags(QAllocOpts opts,
+ uint64_t start, uint64_t end)
+{
+ QGuestAllocator *s = alloc_init(start, end);
+ s->opts = opts;
+ return s;
+}
diff --git a/tests/libqos/malloc.h b/tests/libqos/malloc.h
index 677db77..7b29547 100644
--- a/tests/libqos/malloc.h
+++ b/tests/libqos/malloc.h
@@ -51,4 +51,6 @@ uint64_t guest_alloc(QGuestAllocator *allocator, size_t size);
void guest_free(QGuestAllocator *allocator, uint64_t addr);
QGuestAllocator *alloc_init(uint64_t start, uint64_t end);
+QGuestAllocator *alloc_init_flags(QAllocOpts flags,
+ uint64_t start, uint64_t end);
#endif
--
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 <=
- [Qemu-devel] [PULL v2 07/65] libqos: add qtest_vboot, Stefan Hajnoczi, 2015/02/16
- [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