[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 05/15] libqos: add alloc_init_flags
From: |
John Snow |
Subject: |
[Qemu-devel] [PATCH v2 05/15] libqos: add alloc_init_flags |
Date: |
Mon, 19 Jan 2015 15:15:53 -0500 |
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>
---
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
--
1.9.3
- [Qemu-devel] [PATCH v2 00/15] ahci-test preliminary refactoring, John Snow, 2015/01/19
- [Qemu-devel] [PATCH v2 01/15] libqos: Split apart pc_alloc_init, John Snow, 2015/01/19
- [Qemu-devel] [PATCH v2 06/15] libqos: Update QGuestAllocator to be opaque, John Snow, 2015/01/19
- [Qemu-devel] [PATCH v2 03/15] libqos: create libqos.c, John Snow, 2015/01/19
- [Qemu-devel] [PATCH v2 05/15] libqos: add alloc_init_flags,
John Snow <=
- [Qemu-devel] [PATCH v2 04/15] libqos: add qtest_vboot, John Snow, 2015/01/19
- [Qemu-devel] [PATCH v2 02/15] qtest/ahci: Create ahci.h, John Snow, 2015/01/19
- [Qemu-devel] [PATCH v2 09/15] qtest/ahci: finalize AHCIQState consolidation, John Snow, 2015/01/19
- [Qemu-devel] [PATCH v2 10/15] qtest/ahci: remove pcibus global, John Snow, 2015/01/19
- [Qemu-devel] [PATCH v2 07/15] libqos: add pc specific interface, John Snow, 2015/01/19
- [Qemu-devel] [PATCH v2 13/15] qtest/ahci: remove getter/setter macros, John Snow, 2015/01/19
- [Qemu-devel] [PATCH v2 08/15] qtest/ahci: Store hba_base in AHCIQState, John Snow, 2015/01/19
- [Qemu-devel] [PATCH v2 12/15] libqos/ahci: Functional register helpers, John Snow, 2015/01/19
- [Qemu-devel] [PATCH v2 11/15] qtest/ahci: remove guest_malloc global, John Snow, 2015/01/19