Managing parallel connections to two different monitors via the implicit global_qtest makes it hard to copy-and-paste code to tests that are not aware of the implicit state; the management of global_qtest is even harder to follow because it was masked behind set_context(). Instead, explicitly pass QTestState* around (generally, by reusing the member already present in ahci->parent QOSState), and call explicit qtest_* functions on all places that interact with a monitor. We can assert that the conversion is correct by checking that global_qtest remains NULL throughout the test (a later patch that changes global_qtest to not be a public global variable will drop the assertions). Signed-off-by: Eric Blake <eblake@redhat.com> Acked-by: John Snow <jsnow@redhat.com> [thuth: rebased patch to current master branch] Signed-off-by: Thomas Huth <thuth@redhat.com>
		
			
				
	
	
		
			46 lines
		
	
	
		
			1.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			46 lines
		
	
	
		
			1.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
#ifndef LIBQOS_H
 | 
						|
#define LIBQOS_H
 | 
						|
 | 
						|
#include "libqtest.h"
 | 
						|
#include "libqos/pci.h"
 | 
						|
#include "libqos/malloc.h"
 | 
						|
 | 
						|
typedef struct QOSState QOSState;
 | 
						|
 | 
						|
typedef struct QOSOps {
 | 
						|
    void (*alloc_init)(QGuestAllocator *, QTestState *, QAllocOpts);
 | 
						|
    QPCIBus *(*qpci_new)(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 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
 |