aboutsummaryrefslogtreecommitdiff
path: root/tests/libqos/libqos.c
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/libqos.c
parente5d1730d1e5c1f341d2d692ab2ad0d8d2d7f47e1 (diff)
downloadqemu-05e520f1c7f6ac7a142c616883e00c8924e81331.zip
qemu-05e520f1c7f6ac7a142c616883e00c8924e81331.tar.gz
qemu-05e520f1c7f6ac7a142c616883e00c8924e81331.tar.bz2
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/libqos.c')
-rw-r--r--tests/libqos/libqos.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/libqos/libqos.c b/tests/libqos/libqos.c
index 18f08cf..5729a06 100644
--- a/tests/libqos/libqos.c
+++ b/tests/libqos/libqos.c
@@ -24,7 +24,7 @@ QOSState *qtest_vboot(QOSOps *ops, const char *cmdline_fmt, va_list ap)
qs->qts = qtest_start(cmdline);
qs->ops = ops;
if (ops) {
- qs->alloc = ops->init_allocator(ALLOC_NO_FLAGS);
+ qs->alloc = ops->init_allocator(qs->qts, ALLOC_NO_FLAGS);
qs->pcibus = ops->qpci_init(qs->qts, qs->alloc);
}