From patchwork Mon Jan 19 20:15:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Snow X-Patchwork-Id: 430662 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 7B90314012A for ; Tue, 20 Jan 2015 07:17:01 +1100 (AEDT) Received: from localhost ([::1]:39545 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDIkt-00029n-Ja for incoming@patchwork.ozlabs.org; Mon, 19 Jan 2015 15:16:59 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59045) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDIkD-0000w0-1e for qemu-devel@nongnu.org; Mon, 19 Jan 2015 15:16:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YDIkC-0006kK-1y for qemu-devel@nongnu.org; Mon, 19 Jan 2015 15:16:16 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51076) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDIkB-0006kE-Pm for qemu-devel@nongnu.org; Mon, 19 Jan 2015 15:16:15 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t0JKGCbH016186 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 19 Jan 2015 15:16:12 -0500 Received: from scv.usersys.redhat.com ([10.18.17.38]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t0JKG5ZL016803; Mon, 19 Jan 2015 15:16:11 -0500 From: John Snow To: qemu-devel@nongnu.org Date: Mon, 19 Jan 2015 15:15:53 -0500 Message-Id: <1421698563-6977-6-git-send-email-jsnow@redhat.com> In-Reply-To: <1421698563-6977-1-git-send-email-jsnow@redhat.com> References: <1421698563-6977-1-git-send-email-jsnow@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, marc.mari.barcelo@gmail.com, armbru@redhat.com, mreitz@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, jsnow@redhat.com Subject: [Qemu-devel] [PATCH v2 05/15] libqos: add alloc_init_flags X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Allow a generic interface to alloc_init_flags, not just through pc_alloc_init_flags. Signed-off-by: John Snow Reviewed-by: Paolo Bonzini --- 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