summary refs log tree commit diff stats
path: root/tests/libqos/malloc-pc.h
diff options
context:
space:
mode:
authorEric Blake <eblake@redhat.com>2017-09-11 12:19:57 -0500
committerThomas Huth <thuth@redhat.com>2018-02-14 11:43:41 +0100
commit05e520f1c7f6ac7a142c616883e00c8924e81331 (patch)
tree1304e6ac429eaaf25961ab1e9770c5622f820d48 /tests/libqos/malloc-pc.h
parente5d1730d1e5c1f341d2d692ab2ad0d8d2d7f47e1 (diff)
downloadfocaccia-qemu-05e520f1c7f6ac7a142c616883e00c8924e81331.tar.gz
focaccia-qemu-05e520f1c7f6ac7a142c616883e00c8924e81331.zip
libqos: Use explicit QTestState for fw_cfg operations
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>
Diffstat (limited to 'tests/libqos/malloc-pc.h')
-rw-r--r--tests/libqos/malloc-pc.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/libqos/malloc-pc.h b/tests/libqos/malloc-pc.h
index 86ab9f0429..10f3da6cf2 100644
--- a/tests/libqos/malloc-pc.h
+++ b/tests/libqos/malloc-pc.h
@@ -15,8 +15,8 @@
 
 #include "libqos/malloc.h"
 
-QGuestAllocator *pc_alloc_init(void);
-QGuestAllocator *pc_alloc_init_flags(QAllocOpts flags);
+QGuestAllocator *pc_alloc_init(QTestState *qts);
+QGuestAllocator *pc_alloc_init_flags(QTestState *qts, QAllocOpts flags);
 void pc_alloc_uninit(QGuestAllocator *allocator);
 
 #endif