* [PATCH 0/2] Fix ehci-test
@ 2019-09-26 11:19 Marc-André Lureau
2019-09-26 11:19 ` [PATCH 1/2] tests: fix usb-hcd-ehci-test compilation Marc-André Lureau
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Marc-André Lureau @ 2019-09-26 11:19 UTC (permalink / raw)
To: qemu-devel
Cc: Laurent Vivier, Paolo Bonzini, Thomas Huth, Gerd Hoffmann,
Marc-André Lureau
Hi,
Here are 2 small fixes to fix ehci qtest.
Marc-André Lureau (2):
tests: fix usb-hcd-ehci-test compilation
tests: fix echi/ehci typo
tests/Makefile.include | 4 +---
tests/usb-hcd-ehci-test.c | 4 ++--
2 files changed, 3 insertions(+), 5 deletions(-)
--
2.23.0
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 1/2] tests: fix usb-hcd-ehci-test compilation
2019-09-26 11:19 [PATCH 0/2] Fix ehci-test Marc-André Lureau
@ 2019-09-26 11:19 ` Marc-André Lureau
2019-09-26 11:23 ` Laurent Vivier
2019-09-26 11:49 ` Thomas Huth
2019-09-26 11:19 ` [PATCH 2/2] tests: fix echi/ehci typo Marc-André Lureau
2019-09-27 6:23 ` [PATCH 0/2] Fix ehci-test no-reply
2 siblings, 2 replies; 9+ messages in thread
From: Marc-André Lureau @ 2019-09-26 11:19 UTC (permalink / raw)
To: qemu-devel
Cc: Laurent Vivier, Paolo Bonzini, Thomas Huth, Gerd Hoffmann,
Marc-André Lureau
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 <thuth@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@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);
}
--
2.23.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 1/2] tests: fix usb-hcd-ehci-test compilation
2019-09-26 11:19 ` [PATCH 1/2] tests: fix usb-hcd-ehci-test compilation Marc-André Lureau
@ 2019-09-26 11:23 ` Laurent Vivier
2019-09-26 11:49 ` Thomas Huth
1 sibling, 0 replies; 9+ messages in thread
From: Laurent Vivier @ 2019-09-26 11:23 UTC (permalink / raw)
To: Marc-André Lureau, qemu-devel
Cc: Paolo Bonzini, Thomas Huth, Gerd Hoffmann
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 <thuth@redhat.com>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@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);
> }
>
>
>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 1/2] tests: fix usb-hcd-ehci-test compilation
2019-09-26 11:19 ` [PATCH 1/2] tests: fix usb-hcd-ehci-test compilation Marc-André Lureau
2019-09-26 11:23 ` Laurent Vivier
@ 2019-09-26 11:49 ` Thomas Huth
1 sibling, 0 replies; 9+ messages in thread
From: Thomas Huth @ 2019-09-26 11:49 UTC (permalink / raw)
To: Marc-André Lureau, qemu-devel
Cc: Laurent Vivier, Paolo Bonzini, Gerd Hoffmann
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 <thuth@redhat.com>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@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
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 2/2] tests: fix echi/ehci typo
2019-09-26 11:19 [PATCH 0/2] Fix ehci-test Marc-André Lureau
2019-09-26 11:19 ` [PATCH 1/2] tests: fix usb-hcd-ehci-test compilation Marc-André Lureau
@ 2019-09-26 11:19 ` Marc-André Lureau
2019-09-26 11:24 ` Laurent Vivier
2019-09-26 11:39 ` Thomas Huth
2019-09-27 6:23 ` [PATCH 0/2] Fix ehci-test no-reply
2 siblings, 2 replies; 9+ messages in thread
From: Marc-André Lureau @ 2019-09-26 11:19 UTC (permalink / raw)
To: qemu-devel
Cc: Laurent Vivier, Paolo Bonzini, Thomas Huth, Gerd Hoffmann,
Marc-André Lureau
While at it, simplify using $(land).
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
tests/Makefile.include | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 0595914526..3543451ed3 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -182,9 +182,7 @@ check-qtest-i386-$(CONFIG_PVPANIC) += tests/pvpanic-test$(EXESUF)
check-qtest-i386-$(CONFIG_I82801B11) += tests/i82801b11-test$(EXESUF)
check-qtest-i386-$(CONFIG_IOH3420) += tests/ioh3420-test$(EXESUF)
check-qtest-i386-$(CONFIG_USB_UHCI) += tests/usb-hcd-uhci-test$(EXESUF)
-ifeq ($(CONFIG_USB_ECHI)$(CONFIG_USB_UHCI),yy)
-check-qtest-i386-y += tests/usb-hcd-ehci-test$(EXESUF)
-endif
+check-qtest-i386-$(call land,$(CONFIG_USB_EHCI),$(CONFIG_USB_UHCI)) += tests/usb-hcd-ehci-test$(EXESUF)
check-qtest-i386-$(CONFIG_USB_XHCI_NEC) += tests/usb-hcd-xhci-test$(EXESUF)
check-qtest-i386-y += tests/cpu-plug-test$(EXESUF)
check-qtest-i386-y += tests/q35-test$(EXESUF)
--
2.23.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 2/2] tests: fix echi/ehci typo
2019-09-26 11:19 ` [PATCH 2/2] tests: fix echi/ehci typo Marc-André Lureau
@ 2019-09-26 11:24 ` Laurent Vivier
2019-09-26 11:39 ` Thomas Huth
1 sibling, 0 replies; 9+ messages in thread
From: Laurent Vivier @ 2019-09-26 11:24 UTC (permalink / raw)
To: Marc-André Lureau, qemu-devel
Cc: Paolo Bonzini, Thomas Huth, Gerd Hoffmann
On 26/09/2019 13:19, Marc-André Lureau wrote:
> While at it, simplify using $(land).
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> tests/Makefile.include | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index 0595914526..3543451ed3 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -182,9 +182,7 @@ check-qtest-i386-$(CONFIG_PVPANIC) += tests/pvpanic-test$(EXESUF)
> check-qtest-i386-$(CONFIG_I82801B11) += tests/i82801b11-test$(EXESUF)
> check-qtest-i386-$(CONFIG_IOH3420) += tests/ioh3420-test$(EXESUF)
> check-qtest-i386-$(CONFIG_USB_UHCI) += tests/usb-hcd-uhci-test$(EXESUF)
> -ifeq ($(CONFIG_USB_ECHI)$(CONFIG_USB_UHCI),yy)
> -check-qtest-i386-y += tests/usb-hcd-ehci-test$(EXESUF)
> -endif
> +check-qtest-i386-$(call land,$(CONFIG_USB_EHCI),$(CONFIG_USB_UHCI)) += tests/usb-hcd-ehci-test$(EXESUF)
> check-qtest-i386-$(CONFIG_USB_XHCI_NEC) += tests/usb-hcd-xhci-test$(EXESUF)
> check-qtest-i386-y += tests/cpu-plug-test$(EXESUF)
> check-qtest-i386-y += tests/q35-test$(EXESUF)
>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/2] tests: fix echi/ehci typo
2019-09-26 11:19 ` [PATCH 2/2] tests: fix echi/ehci typo Marc-André Lureau
2019-09-26 11:24 ` Laurent Vivier
@ 2019-09-26 11:39 ` Thomas Huth
2019-09-26 12:53 ` Philippe Mathieu-Daudé
1 sibling, 1 reply; 9+ messages in thread
From: Thomas Huth @ 2019-09-26 11:39 UTC (permalink / raw)
To: Marc-André Lureau, qemu-devel
Cc: Laurent Vivier, Paolo Bonzini, Gerd Hoffmann, Juan Quintela
On 26/09/2019 13.19, Marc-André Lureau wrote:
> While at it, simplify using $(land).
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Fixes: dad5ddcea3b661c6b8ffd83b9bdf0c56001067a2
> ---
> tests/Makefile.include | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index 0595914526..3543451ed3 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -182,9 +182,7 @@ check-qtest-i386-$(CONFIG_PVPANIC) += tests/pvpanic-test$(EXESUF)
> check-qtest-i386-$(CONFIG_I82801B11) += tests/i82801b11-test$(EXESUF)
> check-qtest-i386-$(CONFIG_IOH3420) += tests/ioh3420-test$(EXESUF)
> check-qtest-i386-$(CONFIG_USB_UHCI) += tests/usb-hcd-uhci-test$(EXESUF)
> -ifeq ($(CONFIG_USB_ECHI)$(CONFIG_USB_UHCI),yy)
D'oh!
> -check-qtest-i386-y += tests/usb-hcd-ehci-test$(EXESUF)
> -endif
> +check-qtest-i386-$(call land,$(CONFIG_USB_EHCI),$(CONFIG_USB_UHCI)) += tests/usb-hcd-ehci-test$(EXESUF)
> check-qtest-i386-$(CONFIG_USB_XHCI_NEC) += tests/usb-hcd-xhci-test$(EXESUF)
> check-qtest-i386-y += tests/cpu-plug-test$(EXESUF)
> check-qtest-i386-y += tests/q35-test$(EXESUF)
Reviewed-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/2] tests: fix echi/ehci typo
2019-09-26 11:39 ` Thomas Huth
@ 2019-09-26 12:53 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 9+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-09-26 12:53 UTC (permalink / raw)
To: Thomas Huth, Marc-André Lureau, qemu-devel
Cc: Laurent Vivier, Paolo Bonzini, Gerd Hoffmann, Juan Quintela
On 9/26/19 1:39 PM, Thomas Huth wrote:
> On 26/09/2019 13.19, Marc-André Lureau wrote:
>> While at it, simplify using $(land).
>>
>> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Fixes: dad5ddcea3b661c6b8ffd83b9bdf0c56001067a2
More than 1 year silently ignored, nice...
>
>> ---
>> tests/Makefile.include | 4 +---
>> 1 file changed, 1 insertion(+), 3 deletions(-)
>>
>> diff --git a/tests/Makefile.include b/tests/Makefile.include
>> index 0595914526..3543451ed3 100644
>> --- a/tests/Makefile.include
>> +++ b/tests/Makefile.include
>> @@ -182,9 +182,7 @@ check-qtest-i386-$(CONFIG_PVPANIC) += tests/pvpanic-test$(EXESUF)
>> check-qtest-i386-$(CONFIG_I82801B11) += tests/i82801b11-test$(EXESUF)
>> check-qtest-i386-$(CONFIG_IOH3420) += tests/ioh3420-test$(EXESUF)
>> check-qtest-i386-$(CONFIG_USB_UHCI) += tests/usb-hcd-uhci-test$(EXESUF)
>> -ifeq ($(CONFIG_USB_ECHI)$(CONFIG_USB_UHCI),yy)
>
> D'oh!
:)
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>> -check-qtest-i386-y += tests/usb-hcd-ehci-test$(EXESUF)
>> -endif
>> +check-qtest-i386-$(call land,$(CONFIG_USB_EHCI),$(CONFIG_USB_UHCI)) += tests/usb-hcd-ehci-test$(EXESUF)
>> check-qtest-i386-$(CONFIG_USB_XHCI_NEC) += tests/usb-hcd-xhci-test$(EXESUF)
>> check-qtest-i386-y += tests/cpu-plug-test$(EXESUF)
>> check-qtest-i386-y += tests/q35-test$(EXESUF)
>
> Reviewed-by: Thomas Huth <thuth@redhat.com>
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 0/2] Fix ehci-test
2019-09-26 11:19 [PATCH 0/2] Fix ehci-test Marc-André Lureau
2019-09-26 11:19 ` [PATCH 1/2] tests: fix usb-hcd-ehci-test compilation Marc-André Lureau
2019-09-26 11:19 ` [PATCH 2/2] tests: fix echi/ehci typo Marc-André Lureau
@ 2019-09-27 6:23 ` no-reply
2 siblings, 0 replies; 9+ messages in thread
From: no-reply @ 2019-09-27 6:23 UTC (permalink / raw)
To: marcandre.lureau
Cc: lvivier, thuth, qemu-devel, kraxel, marcandre.lureau, pbonzini
Patchew URL: https://patchew.org/QEMU/20190926111955.17276-1-marcandre.lureau@redhat.com/
Hi,
This series failed the docker-quick@centos7 build test. Please find the testing commands and
their output below. If you have Docker installed, you can probably reproduce it
locally.
=== TEST SCRIPT BEGIN ===
#!/bin/bash
make docker-image-centos7 V=1 NETWORK=1
time make docker-test-quick@centos7 SHOW_ENV=1 J=14 NETWORK=1
=== TEST SCRIPT END ===
libudev no
default devices yes
warning: Python 2 support is deprecated
warning: Python 3 will be required for building future versions of QEMU
cross containers no
NOTE: guest cross-compilers enabled: cc
---
qemu-system-aarch64: cannot set up guest memory 'exynos4210.dram0': Cannot allocate memory
Broken pipe
/tmp/qemu-test/src/tests/libqtest.c:140: kill_qemu() tried to terminate QEMU process but encountered exit status 1 (expected 0)
ERROR - too few tests run (expected 61, got 1)
make: *** [check-qtest-aarch64] Error 1
make: *** Waiting for unfinished jobs....
TEST check-qtest-x86_64: tests/usb-hcd-xhci-test
The full log is available at
http://patchew.org/logs/20190926111955.17276-1-marcandre.lureau@redhat.com/testing.docker-quick@centos7/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2019-09-27 7:04 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-09-26 11:19 [PATCH 0/2] Fix ehci-test Marc-André Lureau
2019-09-26 11:19 ` [PATCH 1/2] tests: fix usb-hcd-ehci-test compilation Marc-André Lureau
2019-09-26 11:23 ` Laurent Vivier
2019-09-26 11:49 ` Thomas Huth
2019-09-26 11:19 ` [PATCH 2/2] tests: fix echi/ehci typo Marc-André Lureau
2019-09-26 11:24 ` Laurent Vivier
2019-09-26 11:39 ` Thomas Huth
2019-09-26 12:53 ` Philippe Mathieu-Daudé
2019-09-27 6:23 ` [PATCH 0/2] Fix ehci-test no-reply
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).