[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 01/15] libqos: Split apart pc_alloc_init
From: |
John Snow |
Subject: |
[Qemu-devel] [PATCH v2 01/15] libqos: Split apart pc_alloc_init |
Date: |
Mon, 19 Jan 2015 15:15:49 -0500 |
Move the list-specific initialization over into
malloc.c, to keep all of the list implementation
details within the same file.
The allocation and freeing of these structures are
now both back within the same layer.
Signed-off-by: John Snow <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
---
tests/libqos/malloc-pc.c | 20 ++++----------------
tests/libqos/malloc.c | 17 +++++++++++++++++
tests/libqos/malloc.h | 1 +
3 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/tests/libqos/malloc-pc.c b/tests/libqos/malloc-pc.c
index c9c48fd..36a0740 100644
--- a/tests/libqos/malloc-pc.c
+++ b/tests/libqos/malloc-pc.c
@@ -32,31 +32,19 @@ void pc_alloc_uninit(QGuestAllocator *allocator)
QGuestAllocator *pc_alloc_init_flags(QAllocOpts flags)
{
- QGuestAllocator *s = g_malloc0(sizeof(*s));
+ QGuestAllocator *s;
uint64_t ram_size;
QFWCFG *fw_cfg = pc_fw_cfg_init();
- MemBlock *node;
+
+ 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->page_size = PAGE_SIZE;
- ram_size = qfw_cfg_get_u64(fw_cfg, FW_CFG_RAM_SIZE);
-
- /* Start at 1MB */
- s->start = 1 << 20;
-
- /* Respect PCI hole */
- s->end = MIN(ram_size, 0xE0000000);
-
/* clean-up */
g_free(fw_cfg);
- QTAILQ_INIT(&s->used);
- QTAILQ_INIT(&s->free);
-
- node = mlist_new(s->start, s->end - s->start);
- QTAILQ_INSERT_HEAD(&s->free, node, MLIST_ENTNAME);
-
return s;
}
diff --git a/tests/libqos/malloc.c b/tests/libqos/malloc.c
index 5debf18..0d34ecd 100644
--- a/tests/libqos/malloc.c
+++ b/tests/libqos/malloc.c
@@ -268,3 +268,20 @@ void guest_free(QGuestAllocator *allocator, uint64_t addr)
mlist_check(allocator);
}
}
+
+QGuestAllocator *alloc_init(uint64_t start, uint64_t end)
+{
+ QGuestAllocator *s = g_malloc0(sizeof(*s));
+ MemBlock *node;
+
+ s->start = start;
+ s->end = end;
+
+ QTAILQ_INIT(&s->used);
+ QTAILQ_INIT(&s->free);
+
+ node = mlist_new(s->start, s->end - s->start);
+ QTAILQ_INSERT_HEAD(&s->free, node, MLIST_ENTNAME);
+
+ return s;
+}
diff --git a/tests/libqos/malloc.h b/tests/libqos/malloc.h
index 465efeb..677db77 100644
--- a/tests/libqos/malloc.h
+++ b/tests/libqos/malloc.h
@@ -50,4 +50,5 @@ void alloc_uninit(QGuestAllocator *allocator);
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);
#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 <=
- [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, 2015/01/19
- [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