From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41805) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YAsG9-0007TQ-Vd for qemu-devel@nongnu.org; Mon, 12 Jan 2015 22:35:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YAsG8-0004qk-Un for qemu-devel@nongnu.org; Mon, 12 Jan 2015 22:35:13 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57009) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YAsG8-0004qK-M8 for qemu-devel@nongnu.org; Mon, 12 Jan 2015 22:35:12 -0500 From: John Snow Date: Mon, 12 Jan 2015 22:34:30 -0500 Message-Id: <1421120079-987-6-git-send-email-jsnow@redhat.com> In-Reply-To: <1421120079-987-1-git-send-email-jsnow@redhat.com> References: <1421120079-987-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PATCH 05/14] libqos: add alloc_init_flags List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, marc.mari.barcelo@gmail.com, armbru@redhat.com, mreitz@redhat.com, stefanha@redhat.com, John Snow Allow a generic interface to alloc_init_flags, not just through pc_alloc_init_flags. Signed-off-by: John Snow --- 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