diff options
| author | Thomas Huth | 2019-07-22 17:10:55 +0200 |
|---|---|---|
| committer | Thomas Huth | 2019-08-15 19:24:10 +0200 |
| commit | e5758de4e836c3b2edc2befd904651fc6967d74f (patch) | |
| tree | 324827884570aa10cb22024f8735e43178e3a947 /tests/usb-hcd-xhci-test.c | |
| parent | tests/libqtest: Clean up qtest_cb_for_every_machine() wrt global_qtest (diff) | |
| download | qemu-e5758de4e836c3b2edc2befd904651fc6967d74f.tar.gz qemu-e5758de4e836c3b2edc2befd904651fc6967d74f.tar.xz qemu-e5758de4e836c3b2edc2befd904651fc6967d74f.zip | |
tests/libqtest: Make qtest_qmp_device_add/del independent from global_qtest
Generic library functions like qtest_qmp_device_add() and _del()
should not depend on the global_qtest variable. Pass the test
state via parameter instead.
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20190813093047.27948-6-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'tests/usb-hcd-xhci-test.c')
| -rw-r--r-- | tests/usb-hcd-xhci-test.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/tests/usb-hcd-xhci-test.c b/tests/usb-hcd-xhci-test.c index b15a51123f..01845371f9 100644 --- a/tests/usb-hcd-xhci-test.c +++ b/tests/usb-hcd-xhci-test.c @@ -18,30 +18,34 @@ static void test_xhci_init(void) static void test_xhci_hotplug(void) { - usb_test_hotplug("xhci", "1", NULL); + usb_test_hotplug(global_qtest, "xhci", "1", NULL); } static void test_usb_uas_hotplug(void) { - qtest_qmp_device_add("usb-uas", "uas", "{}"); - qtest_qmp_device_add("scsi-hd", "scsihd", "{'drive': 'drive0'}"); + QTestState *qts = global_qtest; + + qtest_qmp_device_add(qts, "usb-uas", "uas", "{}"); + qtest_qmp_device_add(qts, "scsi-hd", "scsihd", "{'drive': 'drive0'}"); /* TODO: UAS HBA driver in libqos, to check that added disk is visible after BUS rescan */ - qtest_qmp_device_del("scsihd"); - qtest_qmp_device_del("uas"); + qtest_qmp_device_del(qts, "scsihd"); + qtest_qmp_device_del(qts, "uas"); } static void test_usb_ccid_hotplug(void) { - qtest_qmp_device_add("usb-ccid", "ccid", "{}"); - qtest_qmp_device_del("ccid"); + QTestState *qts = global_qtest; + + qtest_qmp_device_add(qts, "usb-ccid", "ccid", "{}"); + qtest_qmp_device_del(qts, "ccid"); /* check the device can be added again */ - qtest_qmp_device_add("usb-ccid", "ccid", "{}"); - qtest_qmp_device_del("ccid"); + qtest_qmp_device_add(qts, "usb-ccid", "ccid", "{}"); + qtest_qmp_device_del(qts, "ccid"); } int main(int argc, char **argv) |