From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45984) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDFht-0007QJ-40 for qemu-devel@nongnu.org; Mon, 19 Jan 2015 12:01:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YDFhp-0003pd-07 for qemu-devel@nongnu.org; Mon, 19 Jan 2015 12:01:41 -0500 Received: from mail-wi0-x230.google.com ([2a00:1450:400c:c05::230]:47979) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDFho-0003pA-Pz for qemu-devel@nongnu.org; Mon, 19 Jan 2015 12:01:36 -0500 Received: by mail-wi0-f176.google.com with SMTP id em10so7518421wid.3 for ; Mon, 19 Jan 2015 09:01:36 -0800 (PST) Sender: Paolo Bonzini Message-ID: <54BD386C.8080200@redhat.com> Date: Mon, 19 Jan 2015 18:01:32 +0100 From: Paolo Bonzini MIME-Version: 1.0 References: <1421120079-987-1-git-send-email-jsnow@redhat.com> <1421120079-987-6-git-send-email-jsnow@redhat.com> In-Reply-To: <1421120079-987-6-git-send-email-jsnow@redhat.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 05/14] libqos: add alloc_init_flags List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: John Snow , qemu-devel@nongnu.org Cc: kwolf@redhat.com, marc.mari.barcelo@gmail.com, armbru@redhat.com, stefanha@redhat.com, mreitz@redhat.com On 13/01/2015 04:34, John Snow wrote: > 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 > Reviewed-by: Paolo Bonzini