f6f363c1f4
To avoid the architecture-specific implementations of the generic qtest
allocator having to know about fields within the allocator, add a
page_size setter method for users or arch specializations to use.
The allocator will assume a default page_size for general use, but it
can always be overridden.
Since this was the last instance of code directly using properties of the
QGuestAllocator object directly, modify the type to be opaque and move
the structure inside of malloc.c.
mlist_new, which was previously exported, is made static local to malloc.c,
as it has no external users.
[Peter Maydell <peter.maydell@linaro.org> reported the following clang
warning:
tests/libqos/malloc.c:35:3: warning:
redefinition of typedef 'QGuestAllocator' is a C11 feature
[-Wtypedef-redefinition]
} QGuestAllocator;
I converted typedef struct ... QGuestAllocator; to struct ...;
--Stefan]
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Marc Marí <marc.mari.barcelo@gmail.com>
Message-id: 1421698563-6977-7-git-send-email-jsnow@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
41 lines
1 KiB
C
41 lines
1 KiB
C
/*
|
|
* libqos malloc support
|
|
*
|
|
* Copyright IBM, Corp. 2012-2013
|
|
*
|
|
* Authors:
|
|
* Anthony Liguori <aliguori@us.ibm.com>
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
* See the COPYING file in the top-level directory.
|
|
*/
|
|
|
|
#ifndef LIBQOS_MALLOC_H
|
|
#define LIBQOS_MALLOC_H
|
|
|
|
#include <stdint.h>
|
|
#include <sys/types.h>
|
|
#include "qemu/queue.h"
|
|
|
|
typedef enum {
|
|
ALLOC_NO_FLAGS = 0x00,
|
|
ALLOC_LEAK_WARN = 0x01,
|
|
ALLOC_LEAK_ASSERT = 0x02,
|
|
ALLOC_PARANOID = 0x04
|
|
} QAllocOpts;
|
|
|
|
typedef struct QGuestAllocator QGuestAllocator;
|
|
|
|
void alloc_uninit(QGuestAllocator *allocator);
|
|
|
|
/* Always returns page aligned values */
|
|
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);
|
|
void alloc_set_page_size(QGuestAllocator *allocator, size_t page_size);
|
|
|
|
#endif
|