On Tue, Aug 13, 2019 at 11:30:41AM +0200, Thomas Huth wrote: > While global_qtest and its wrapper functions work fine for tests that only > run one instance of QEMU, using the global_qtest variable in our qtests is > very problematic for tests that use multiple test states (e.g. migration > tests). Thus the core libqtest and libqos library functions should not > depend on global_qtest or functions that rely on this variable. > > This patch series gets rid of these dependencies in most of the libqtest > and libqos code. > > Thomas Huth (6): > tests/libqos: Make generic virtio code independent from global_qtest > tests/libqos: Make virtio-pci code independent from global_qtest > tests/libqtest: Remove unused function hmp() > tests/libqtest: Clean up qtest_cb_for_every_machine() wrt global_qtest > tests/libqtest: Make qtest_qmp_device_add/del independent from > global_qtest > tests/libqtest: Make qmp_assert_success() independent from > global_qtest > > tests/cpu-plug-test.c | 15 ++-- > tests/e1000e-test.c | 2 +- > tests/ivshmem-test.c | 2 +- > tests/libqos/usb.c | 6 +- > tests/libqos/usb.h | 2 +- > tests/libqos/virtio-pci.c | 8 +- > tests/libqos/virtio.c | 74 +++++++++--------- > tests/libqos/virtio.h | 27 ++++--- > tests/libqtest.c | 37 ++++----- > tests/libqtest.h | 24 +++--- > tests/usb-hcd-ohci-test.c | 2 +- > tests/usb-hcd-uhci-test.c | 8 +- > tests/usb-hcd-xhci-test.c | 22 +++--- > tests/virtio-9p-test.c | 16 ++-- > tests/virtio-blk-test.c | 153 +++++++++++++++++++------------------ > tests/virtio-ccw-test.c | 18 +++-- > tests/virtio-net-test.c | 35 +++++---- > tests/virtio-rng-test.c | 2 +- > tests/virtio-scsi-test.c | 22 +++--- > tests/virtio-serial-test.c | 4 +- > 20 files changed, 251 insertions(+), 228 deletions(-) Reviewed-by: Stefan Hajnoczi