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>
53 lines
1.1 KiB
C
53 lines
1.1 KiB
C
/*
|
|
* libqos malloc support for PC
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#include "libqos/malloc-pc.h"
|
|
#include "libqos/fw_cfg.h"
|
|
|
|
#define NO_QEMU_PROTOS
|
|
#include "hw/nvram/fw_cfg.h"
|
|
|
|
#include "qemu-common.h"
|
|
#include <glib.h>
|
|
|
|
#define PAGE_SIZE (4096)
|
|
|
|
/*
|
|
* Mostly for valgrind happiness, but it does offer
|
|
* a chokepoint for debugging guest memory leaks, too.
|
|
*/
|
|
void pc_alloc_uninit(QGuestAllocator *allocator)
|
|
{
|
|
alloc_uninit(allocator);
|
|
}
|
|
|
|
QGuestAllocator *pc_alloc_init_flags(QAllocOpts flags)
|
|
{
|
|
QGuestAllocator *s;
|
|
uint64_t ram_size;
|
|
QFWCFG *fw_cfg = pc_fw_cfg_init();
|
|
|
|
ram_size = qfw_cfg_get_u64(fw_cfg, FW_CFG_RAM_SIZE);
|
|
s = alloc_init_flags(flags, 1 << 20, MIN(ram_size, 0xE0000000));
|
|
alloc_set_page_size(s, PAGE_SIZE);
|
|
|
|
/* clean-up */
|
|
g_free(fw_cfg);
|
|
|
|
return s;
|
|
}
|
|
|
|
inline QGuestAllocator *pc_alloc_init(void)
|
|
{
|
|
return pc_alloc_init_flags(ALLOC_NO_FLAGS);
|
|
}
|