On 26/09/2019 13.19, Marc-André Lureau wrote:
> Fixes commit
> e5758de4e836c3b2edc2befd904651fc6967d74f ("tests/libqtest: Make
> qtest_qmp_device_add/del independent from global_qtest")
>
> and commit
> dd210749727530cdef7c335040edbf81c3c5d041 ("tests/libqtest: Use
> libqtest-single.h in tests that require global_qtest").
>
> Cc: Thomas Huth <th...@redhat.com>
> Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com>
> ---
> tests/usb-hcd-ehci-test.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tests/usb-hcd-ehci-test.c b/tests/usb-hcd-ehci-test.c
> index 8bc3e44189..5251d539e9 100644
> --- a/tests/usb-hcd-ehci-test.c
> +++ b/tests/usb-hcd-ehci-test.c
> @@ -8,7 +8,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "libqtest.h"
> +#include "libqtest-single.h"
> #include "libqos/pci-pc.h"
> #include "hw/usb/uhci-regs.h"
> #include "hw/usb/ehci-regs.h"
> @@ -139,7 +139,7 @@ static void pci_ehci_port_3_hotplug(void)
>
> static void pci_ehci_port_hotplug(void)
> {
> - usb_test_hotplug("ich9-ehci-1", "3", pci_ehci_port_3_hotplug);
> + usb_test_hotplug(global_qtest, "ich9-ehci-1", "3",
> pci_ehci_port_3_hotplug);
> }
Thanks, I've queued both patches to my qtest-next branch now:
https://gitlab.com/huth/qemu/commits/qtest-next
Thomas
