From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37129) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XeEy0-0005yi-4S for qemu-devel@nongnu.org; Tue, 14 Oct 2014 23:09:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XeExr-0004jB-Hp for qemu-devel@nongnu.org; Tue, 14 Oct 2014 23:09:36 -0400 Received: from cantor2.suse.de ([195.135.220.15]:49314 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XeExr-0004ih-6q for qemu-devel@nongnu.org; Tue, 14 Oct 2014 23:09:27 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 15 Oct 2014 05:08:48 +0200 Message-Id: <1413342561-4754-15-git-send-email-afaerber@suse.de> In-Reply-To: <1413342561-4754-1-git-send-email-afaerber@suse.de> References: <1413342561-4754-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 14/47] tests: usb: Generic usb device hotplug List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Gerd Hoffmann From: Igor Mammedov use usb-tablet as a hotplugged usb device. Signed-off-by: Igor Mammedov Reviewed-by: Paolo Bonzini Signed-off-by: Andreas F=C3=A4rber --- tests/Makefile | 4 ++-- tests/libqos/usb.c | 34 ++++++++++++++++++++++++++++++++++ tests/libqos/usb.h | 3 +++ tests/usb-hcd-ehci-test.c | 14 ++++++++++++++ tests/usb-hcd-ohci-test.c | 10 ++++++++-- tests/usb-hcd-uhci-test.c | 20 ++++++++++++++++++-- tests/usb-hcd-xhci-test.c | 11 ++++++++--- 7 files changed, 87 insertions(+), 9 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 6d14388..95deff0 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -344,10 +344,10 @@ tests/ac97-test$(EXESUF): tests/ac97-test.o tests/es1370-test$(EXESUF): tests/es1370-test.o tests/intel-hda-test$(EXESUF): tests/intel-hda-test.o tests/ioh3420-test$(EXESUF): tests/ioh3420-test.o -tests/usb-hcd-ohci-test$(EXESUF): tests/usb-hcd-ohci-test.o +tests/usb-hcd-ohci-test$(EXESUF): tests/usb-hcd-ohci-test.o $(libqos-usb= -obj-y) tests/usb-hcd-uhci-test$(EXESUF): tests/usb-hcd-uhci-test.o $(libqos-usb= -obj-y) tests/usb-hcd-ehci-test$(EXESUF): tests/usb-hcd-ehci-test.o $(libqos-usb= -obj-y) -tests/usb-hcd-xhci-test$(EXESUF): tests/usb-hcd-xhci-test.o +tests/usb-hcd-xhci-test$(EXESUF): tests/usb-hcd-xhci-test.o $(libqos-usb= -obj-y) tests/vhost-user-test$(EXESUF): tests/vhost-user-test.o qemu-char.o qemu= -timer.o $(qtest-obj-y) tests/qemu-iotests/socket_scm_helper$(EXESUF): tests/qemu-iotests/socket= _scm_helper.o tests/test-qemu-opts$(EXESUF): tests/test-qemu-opts.o libqemuutil.a libq= emustub.a diff --git a/tests/libqos/usb.c b/tests/libqos/usb.c index 54865b4..41d89b8 100644 --- a/tests/libqos/usb.c +++ b/tests/libqos/usb.c @@ -35,3 +35,37 @@ void uhci_port_test(struct qhc *hc, int port, uint16_t= expect) =20 g_assert((value & mask) =3D=3D (expect & mask)); } + +void usb_test_hotplug(const char *hcd_id, const int port, + void (*port_check)(void)) +{ + QDict *response; + char *cmd; + + cmd =3D g_strdup_printf("{'execute': 'device_add'," + " 'arguments': {" + " 'driver': 'usb-tablet'," + " 'port': '%d'," + " 'bus': '%s.0'," + " 'id': 'usbdev%d'" + "}}", port, hcd_id, port); + response =3D qmp(cmd); + g_free(cmd); + g_assert(response); + g_assert(!qdict_haskey(response, "error")); + QDECREF(response); + + if (port_check) { + port_check(); + } + + cmd =3D g_strdup_printf("{'execute': 'device_del'," + " 'arguments': {" + " 'id': 'usbdev%d'" + "}}", port); + response =3D qmp(cmd); + g_free(cmd); + g_assert(response); + g_assert(qdict_haskey(response, "event")); + g_assert(!strcmp(qdict_get_str(response, "event"), "DEVICE_DELETED")= ); +} diff --git a/tests/libqos/usb.h b/tests/libqos/usb.h index 7fcd669..8fe5687 100644 --- a/tests/libqos/usb.h +++ b/tests/libqos/usb.h @@ -11,4 +11,7 @@ struct qhc { void qusb_pci_init_one(QPCIBus *pcibus, struct qhc *hc, uint32_t devfn, int bar); void uhci_port_test(struct qhc *hc, int port, uint16_t expect); + +void usb_test_hotplug(const char *bus_name, const int port, + void (*port_check)(void)); #endif diff --git a/tests/usb-hcd-ehci-test.c b/tests/usb-hcd-ehci-test.c index 69f8522..75073bf 100644 --- a/tests/usb-hcd-ehci-test.c +++ b/tests/usb-hcd-ehci-test.c @@ -128,6 +128,19 @@ static void pci_ehci_port_2(void) } } =20 +static void pci_ehci_port_3_hotplug(void) +{ + /* check for presence of hotplugged usb-tablet */ + g_assert(pcibus !=3D NULL); + ehci_port_test(&ehci1, 2, PORTSC_PPOWER | PORTSC_CONNECT); +} + +static void pci_ehci_port_hotplug(void) +{ + usb_test_hotplug("ich9-ehci-1", 3, pci_ehci_port_3_hotplug); +} + + int main(int argc, char **argv) { int ret; @@ -139,6 +152,7 @@ int main(int argc, char **argv) qtest_add_func("/ehci/pci/ehci-config", pci_ehci_config); qtest_add_func("/ehci/pci/uhci-port-2", pci_uhci_port_2); qtest_add_func("/ehci/pci/ehci-port-2", pci_ehci_port_2); + qtest_add_func("/ehci/pci/ehci-port-3-hotplug", pci_ehci_port_hotplu= g); =20 qtest_start("-machine q35 -device ich9-usb-ehci1,bus=3Dpcie.0,addr=3D= 1d.7," "multifunction=3Don,id=3Dich9-ehci-1 " diff --git a/tests/usb-hcd-ohci-test.c b/tests/usb-hcd-ohci-test.c index fbc3ffe..1160bde 100644 --- a/tests/usb-hcd-ohci-test.c +++ b/tests/usb-hcd-ohci-test.c @@ -11,15 +11,18 @@ #include #include "libqtest.h" #include "qemu/osdep.h" +#include "libqos/usb.h" =20 =20 static void test_ohci_init(void) { - qtest_start("-device pci-ohci,id=3Dohci"); =20 - qtest_end(); } =20 +static void test_ohci_hotplug(void) +{ + usb_test_hotplug("ohci", 1, NULL); +} =20 int main(int argc, char **argv) { @@ -28,8 +31,11 @@ int main(int argc, char **argv) g_test_init(&argc, &argv, NULL); =20 qtest_add_func("/ohci/pci/init", test_ohci_init); + qtest_add_func("/ohci/pci/hotplug", test_ohci_hotplug); =20 + qtest_start("-device pci-ohci,id=3Dohci"); ret =3D g_test_run(); + qtest_end(); =20 return ret; } diff --git a/tests/usb-hcd-uhci-test.c b/tests/usb-hcd-uhci-test.c index 68047b8..da96f98 100644 --- a/tests/usb-hcd-uhci-test.c +++ b/tests/usb-hcd-uhci-test.c @@ -19,17 +19,32 @@ static void test_uhci_init(void) { } =20 -static void test_port_1(void) +static void test_port(int port) { QPCIBus *pcibus; struct qhc uhci; =20 + g_assert(port > 0); pcibus =3D qpci_init_pc(); g_assert(pcibus !=3D NULL); qusb_pci_init_one(pcibus, &uhci, QPCI_DEVFN(0x1d, 0), 4); - uhci_port_test(&uhci, 0, UHCI_PORT_CCS); + uhci_port_test(&uhci, port - 1, UHCI_PORT_CCS); +} + +static void test_port_1(void) +{ + test_port(1); } =20 +static void test_port_2(void) +{ + test_port(2); +} + +static void test_uhci_hotplug(void) +{ + usb_test_hotplug("uhci", 2, test_port_2); +} =20 int main(int argc, char **argv) { @@ -39,6 +54,7 @@ int main(int argc, char **argv) =20 qtest_add_func("/uhci/pci/init", test_uhci_init); qtest_add_func("/uhci/pci/port1", test_port_1); + qtest_add_func("/uhci/pci/hotplug", test_uhci_hotplug); =20 qtest_start("-device piix3-usb-uhci,id=3Duhci,addr=3D1d.0" " -device usb-tablet,bus=3Duhci.0,port=3D1"); diff --git a/tests/usb-hcd-xhci-test.c b/tests/usb-hcd-xhci-test.c index 743e979..d16963d 100644 --- a/tests/usb-hcd-xhci-test.c +++ b/tests/usb-hcd-xhci-test.c @@ -11,15 +11,17 @@ #include #include "libqtest.h" #include "qemu/osdep.h" +#include "libqos/usb.h" =20 =20 static void test_xhci_init(void) { - qtest_start("-device nec-usb-xhci,id=3Dxhci"); - - qtest_end(); } =20 +static void test_xhci_hotplug(void) +{ + usb_test_hotplug("xhci", 1, NULL); +} =20 int main(int argc, char **argv) { @@ -28,8 +30,11 @@ int main(int argc, char **argv) g_test_init(&argc, &argv, NULL); =20 qtest_add_func("/xhci/pci/init", test_xhci_init); + qtest_add_func("/xhci/pci/hotplug", test_xhci_hotplug); =20 + qtest_start("-device nec-usb-xhci,id=3Dxhci"); ret =3D g_test_run(); + qtest_end(); =20 return ret; } --=20 1.8.4.5