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>
		
			
				
	
	
		
			39 lines
		
	
	
		
			795 B
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			39 lines
		
	
	
		
			795 B
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * libqos malloc support for SPAPR
 | 
						|
 *
 | 
						|
 * 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-spapr.h"
 | 
						|
 | 
						|
#include "qemu-common.h"
 | 
						|
 | 
						|
#define PAGE_SIZE 4096
 | 
						|
 | 
						|
/* Memory must be a multiple of 256 MB,
 | 
						|
 * so we have at least 256MB
 | 
						|
 */
 | 
						|
#define SPAPR_MIN_SIZE 0x10000000
 | 
						|
 | 
						|
void spapr_alloc_uninit(QGuestAllocator *allocator)
 | 
						|
{
 | 
						|
    alloc_uninit(allocator);
 | 
						|
}
 | 
						|
 | 
						|
QGuestAllocator *spapr_alloc_init_flags(QTestState *qts, QAllocOpts flags)
 | 
						|
{
 | 
						|
    QGuestAllocator *s;
 | 
						|
 | 
						|
    s = alloc_init_flags(flags, 1 << 20, SPAPR_MIN_SIZE);
 | 
						|
    alloc_set_page_size(s, PAGE_SIZE);
 | 
						|
 | 
						|
    return s;
 | 
						|
}
 | 
						|
 | 
						|
QGuestAllocator *spapr_alloc_init(void)
 | 
						|
{
 | 
						|
    return spapr_alloc_init_flags(NULL, ALLOC_NO_FLAGS);
 | 
						|
}
 |