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>
		
			
				
	
	
		
			48 lines
		
	
	
		
			1.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			48 lines
		
	
	
		
			1.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
#ifndef LIBQOS_H
 | 
						|
#define LIBQOS_H
 | 
						|
 | 
						|
#include "libqtest.h"
 | 
						|
#include "libqos/pci.h"
 | 
						|
#include "libqos/malloc-pc.h"
 | 
						|
 | 
						|
typedef struct QOSState QOSState;
 | 
						|
 | 
						|
typedef struct QOSOps {
 | 
						|
    QGuestAllocator *(*init_allocator)(QTestState *qts, QAllocOpts);
 | 
						|
    void (*uninit_allocator)(QGuestAllocator *);
 | 
						|
    QPCIBus *(*qpci_init)(QTestState *qts, QGuestAllocator *alloc);
 | 
						|
    void (*qpci_free)(QPCIBus *bus);
 | 
						|
    void (*shutdown)(QOSState *);
 | 
						|
} QOSOps;
 | 
						|
 | 
						|
struct QOSState {
 | 
						|
    QTestState *qts;
 | 
						|
    QGuestAllocator *alloc;
 | 
						|
    QPCIBus *pcibus;
 | 
						|
    QOSOps *ops;
 | 
						|
};
 | 
						|
 | 
						|
QOSState *qtest_vboot(QOSOps *ops, const char *cmdline_fmt, va_list ap);
 | 
						|
QOSState *qtest_boot(QOSOps *ops, const char *cmdline_fmt, ...);
 | 
						|
void qtest_common_shutdown(QOSState *qs);
 | 
						|
void qtest_shutdown(QOSState *qs);
 | 
						|
bool have_qemu_img(void);
 | 
						|
void mkimg(const char *file, const char *fmt, unsigned size_mb);
 | 
						|
void mkqcow2(const char *file, unsigned size_mb);
 | 
						|
void set_context(QOSState *s);
 | 
						|
void migrate(QOSState *from, QOSState *to, const char *uri);
 | 
						|
void prepare_blkdebug_script(const char *debug_fn, const char *event);
 | 
						|
void generate_pattern(void *buffer, size_t len, size_t cycle_len);
 | 
						|
 | 
						|
static inline uint64_t qmalloc(QOSState *q, size_t bytes)
 | 
						|
{
 | 
						|
    return guest_alloc(q->alloc, bytes);
 | 
						|
}
 | 
						|
 | 
						|
static inline void qfree(QOSState *q, uint64_t addr)
 | 
						|
{
 | 
						|
    guest_free(q->alloc, addr);
 | 
						|
}
 | 
						|
 | 
						|
#endif
 |