From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53253) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y9WdC-0004Ut-Ab for qemu-devel@nongnu.org; Fri, 09 Jan 2015 05:17:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y9WdB-0000oS-E3 for qemu-devel@nongnu.org; Fri, 09 Jan 2015 05:17:26 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38470) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y9WdB-0000o3-6t for qemu-devel@nongnu.org; Fri, 09 Jan 2015 05:17:25 -0500 From: Stefan Hajnoczi Date: Fri, 9 Jan 2015 10:16:45 +0000 Message-Id: <1420798626-11428-6-git-send-email-stefanha@redhat.com> In-Reply-To: <1420798626-11428-1-git-send-email-stefanha@redhat.com> References: <1420798626-11428-1-git-send-email-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 05/26] libqos: Add malloc generic List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc=20Mar=C3=AD?= , Peter Maydell , Stefan Hajnoczi From: Marc Mar=C3=AD This malloc is a basic interface implementation that works for any platfo= rm. It should be replaced in the future for a real malloc implementation for = each of the platforms. Signed-off-by: Marc Mar=C3=AD Signed-off-by: Stefan Hajnoczi --- tests/libqos/malloc-generic.c | 50 +++++++++++++++++++++++++++++++++++++= ++++++ tests/libqos/malloc-generic.h | 21 ++++++++++++++++++ 2 files changed, 71 insertions(+) create mode 100644 tests/libqos/malloc-generic.c create mode 100644 tests/libqos/malloc-generic.h diff --git a/tests/libqos/malloc-generic.c b/tests/libqos/malloc-generic.= c new file mode 100644 index 0000000..a0878c5 --- /dev/null +++ b/tests/libqos/malloc-generic.c @@ -0,0 +1,50 @@ +/* + * Basic libqos generic malloc support + * + * Copyright (c) 2014 Marc Mar=C3=AD + * + * This work is licensed under the terms of the GNU GPL, version 2 or la= ter. + * See the COPYING file in the top-level directory. + */ + +#include +#include "libqos/malloc-generic.h" +#include "libqos/malloc.h" + +/* + * Mostly for valgrind happiness, but it does offer + * a chokepoint for debugging guest memory leaks, too. + */ +void generic_alloc_uninit(QGuestAllocator *allocator) +{ + alloc_uninit(allocator); +} + +QGuestAllocator *generic_alloc_init_flags(uint64_t base_addr, uint64_t s= ize, + uint32_t page_size, QAllocOpts f= lags) +{ + QGuestAllocator *s =3D g_malloc0(sizeof(*s)); + MemBlock *node; + + s->opts =3D flags; + s->page_size =3D page_size; + + /* Start at 1MB */ + s->start =3D base_addr + (1 << 20); + + s->end =3D s->start + size; + + QTAILQ_INIT(&s->used); + QTAILQ_INIT(&s->free); + + node =3D mlist_new(s->start, s->end - s->start); + QTAILQ_INSERT_HEAD(&s->free, node, MLIST_ENTNAME); + + return s; +} + +inline QGuestAllocator *generic_alloc_init(uint64_t base_addr, uint64_t = size, + uint32_t pag= e_size) +{ + return generic_alloc_init_flags(base_addr, size, page_size, ALLOC_NO= _FLAGS); +} diff --git a/tests/libqos/malloc-generic.h b/tests/libqos/malloc-generic.= h new file mode 100644 index 0000000..90104ec --- /dev/null +++ b/tests/libqos/malloc-generic.h @@ -0,0 +1,21 @@ +/* + * Basic libqos generic malloc support + * + * Copyright (c) 2014 Marc Mar=C3=AD + * + * This work is licensed under the terms of the GNU GPL, version 2 or la= ter. + * See the COPYING file in the top-level directory. + */ + +#ifndef LIBQOS_MALLOC_GENERIC_H +#define LIBQOS_MALLOC_GENERIC_H + +#include "libqos/malloc.h" + +QGuestAllocator *generic_alloc_init(uint64_t base_addr, uint64_t size, + uint32_t pag= e_size); +QGuestAllocator *generic_alloc_init_flags(uint64_t base_addr, uint64_t s= ize, + uint32_t page_size, QAllocOpts f= lags); +void generic_alloc_uninit(QGuestAllocator *allocator); + +#endif --=20 2.1.0