05e520f1c7
Drop one more client of global_qtest by teaching all fw_cfg test functionality (invoked through alloc-pc) to pass in an explicit QTestState, adjusting all callers. In particular, fw_cfg-test had to reorder things to create the test state prior to creating the fw_cfg (and drop a pointless strdup in the meantime), but that test now no longer depends on global_qtest. Signed-off-by: Eric Blake <eblake@redhat.com> Reviewed-by: John Snow <jsnow@redhat.com> Reviewed-by: Thomas Huth <thuth@redhat.com> [thuth: Fixed conflict wrt pc_alloc_init() in vhost-user-test.c] Signed-off-by: Thomas Huth <thuth@redhat.com>
52 lines
1.1 KiB
C
52 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 "qemu/osdep.h"
|
|
#include "libqos/malloc-pc.h"
|
|
#include "libqos/fw_cfg.h"
|
|
|
|
#include "hw/nvram/fw_cfg_keys.h"
|
|
|
|
#include "qemu-common.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(QTestState *qts, QAllocOpts flags)
|
|
{
|
|
QGuestAllocator *s;
|
|
uint64_t ram_size;
|
|
QFWCFG *fw_cfg = pc_fw_cfg_init(qts);
|
|
|
|
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(QTestState *qts)
|
|
{
|
|
return pc_alloc_init_flags(qts, ALLOC_NO_FLAGS);
|
|
}
|