aboutsummaryrefslogtreecommitdiff
path: root/tests/ahci-test.c
diff options
context:
space:
mode:
authorEric Blake <eblake@redhat.com>2017-09-11 12:19:52 -0500
committerThomas Huth <thuth@redhat.com>2018-02-14 11:43:02 +0100
commite5d1730d1e5c1f341d2d692ab2ad0d8d2d7f47e1 (patch)
treeced804356dd9e41b2b6e4c9d64c45a3b66ca69a8 /tests/ahci-test.c
parent50990b162c471a8de992d43a170a3ccf24462720 (diff)
libqos: Track QTestState with QPCIBus
When initializing a QPCIBus, track which QTestState the bus is associated with (so that a later patch can then explicitly use that test state for all communication on the bus, rather than blindly relying on global_qtest). Update the initialization functions to take another parameter, and update all callers to pass in state (for now, most callers get away with passing the current global_qtest as the current state, although this required fixing the order of initialization to ensure qtest_start() is called before qpci_init*() in rtl8139-test, and provided an opportunity to pass in the allocator in e1000e-test). Touch up some allocations to use g_new0() rather than g_malloc() while in the area, and simplify some code (all implementations of QOSOps provide a .init_allocator() that never fails). Signed-off-by: Eric Blake <eblake@redhat.com> Reviewed-by: John Snow <jsnow@redhat.com> Reviewed-by: Thomas Huth <thuth@redhat.com> [thuth: Removed hunk from vhost-user-test.c that is not required anymore, fixed conflict in qtest_vboot() and adjusted qpci_init_pc() in sdhci-test] Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'tests/ahci-test.c')
-rw-r--r--tests/ahci-test.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/ahci-test.c b/tests/ahci-test.c
index 7aa5af428c..e847c98df1 100644
--- a/tests/ahci-test.c
+++ b/tests/ahci-test.c
@@ -161,7 +161,7 @@ static AHCIQState *ahci_vboot(const char *cli, va_list ap)
alloc_set_flags(s->parent->alloc, ALLOC_LEAK_ASSERT);
/* Verify that we have an AHCI device present. */
- s->dev = get_ahci_device(&s->fingerprint);
+ s->dev = get_ahci_device(s->parent->qts, &s->fingerprint);
return s;
}