qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gonglei <arei.gonglei@huawei.com>, Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PATCH 5/5] tests: add usb hcds hotplugging qtest
Date: Tue, 16 Sep 2014 08:43:39 +0200	[thread overview]
Message-ID: <1410849819-24102-6-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1410849819-24102-1-git-send-email-kraxel@redhat.com>

From: Gonglei <arei.gonglei@huawei.com>

Because of we now support usb hcds hotplugging, and
collect all hcds hotplugging tests into one file
for code sharing.

Signed-off-by: Gonglei <arei.gonglei@huawei.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 tests/Makefile               |  2 ++
 tests/usb-hcd-hotplug-test.c | 86 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 88 insertions(+)
 create mode 100644 tests/usb-hcd-hotplug-test.c

diff --git a/tests/Makefile b/tests/Makefile
index d5db97b..7c4d0b7 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -165,6 +165,7 @@ gcov-files-i386-y += hw/usb/dev-hid.c
 gcov-files-i386-y += hw/usb/dev-storage.c
 check-qtest-i386-y += tests/usb-hcd-xhci-test$(EXESUF)
 gcov-files-i386-y += hw/usb/hcd-xhci.c
+check-qtest-i386-y += tests/usb-hcd-hotplug-test$(EXESUF)
 check-qtest-i386-$(CONFIG_LINUX) += tests/vhost-user-test$(EXESUF)
 check-qtest-x86_64-y = $(check-qtest-i386-y)
 gcov-files-i386-y += i386-softmmu/hw/timer/mc146818rtc.c
@@ -345,6 +346,7 @@ tests/usb-hcd-ohci-test$(EXESUF): tests/usb-hcd-ohci-test.o
 tests/usb-hcd-uhci-test$(EXESUF): tests/usb-hcd-uhci-test.o
 tests/usb-hcd-ehci-test$(EXESUF): tests/usb-hcd-ehci-test.o $(libqos-pc-obj-y)
 tests/usb-hcd-xhci-test$(EXESUF): tests/usb-hcd-xhci-test.o
+tests/usb-hcd-hotplug-test$(EXESUF): tests/usb-hcd-hotplug-test.o
 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 libqemustub.a
diff --git a/tests/usb-hcd-hotplug-test.c b/tests/usb-hcd-hotplug-test.c
new file mode 100644
index 0000000..8287b18
--- /dev/null
+++ b/tests/usb-hcd-hotplug-test.c
@@ -0,0 +1,86 @@
+/*
+ * QTest testcase for usb host adapters hotplug/unplug
+ *
+ * Copyright (c) 2014 HUAWEI TECHNOLOGIES CO.,LTD.
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
+#include <glib.h>
+#include <string.h>
+#include "libqtest.h"
+#include "qemu/osdep.h"
+
+
+static void usb_hcd_hotplug(const char *hcd, const char *id)
+{
+    QDict *response;
+    char *bus;
+
+    qtest_start("");
+
+    /* hotplug an usb host adapter */
+    response = qmp("{ 'execute': 'device_add',"
+                   " 'arguments': { 'driver': %s,"
+                   " 'id': %s } }", hcd, id);
+    g_assert(response);
+    g_assert(!qdict_haskey(response, "error"));
+    QDECREF(response);
+
+    /* hotplug an usb-tablet to the usb host adapter, bus=$id.0 */
+    bus = g_strdup_printf("%s.0", id);
+    response = qmp("{ 'execute': 'device_add',"
+                   "  'arguments': { 'driver': 'usb-tablet',"
+                   "  'bus': %s } }", bus);
+    g_free(bus);
+    g_assert(response);
+    g_assert(!qdict_haskey(response, "error"));
+    QDECREF(response);
+
+    /* delete the usb host adapter */
+    response = qmp("{ 'execute': 'device_del',"
+                   " 'arguments': {"
+                   " 'id': %s } }", id);
+    g_assert(response);
+    g_assert(!qdict_haskey(response, "error"));
+    QDECREF(response);
+
+    qtest_end();
+}
+
+static void test_ohci_hotplug(void)
+{
+    usb_hcd_hotplug("pci-ohci", "ohci");
+}
+
+static void test_uhci_hotplug(void)
+{
+    usb_hcd_hotplug("piix3-usb-uhci", "uhci");
+}
+
+static void test_ehci_hotplug(void)
+{
+    usb_hcd_hotplug("usb-ehci", "ehci");
+}
+
+static void test_xhci_hotplug(void)
+{
+    usb_hcd_hotplug("nec-usb-xhci", "xhci");
+}
+
+int main(int argc, char **argv)
+{
+    int ret;
+
+    g_test_init(&argc, &argv, NULL);
+
+    qtest_add_func("/usb/hcd/pci/ohci-hotplug", test_ohci_hotplug);
+    qtest_add_func("/usb/hcd/pci/uhci-hotplug", test_uhci_hotplug);
+    qtest_add_func("/usb/hcd/pci/ehci-hotplug", test_ehci_hotplug);
+    qtest_add_func("/usb/hcd/pci/xhci-hotplug", test_xhci_hotplug);
+
+    ret = g_test_run();
+
+    return ret;
+}
-- 
1.8.3.1

  parent reply	other threads:[~2014-09-16  6:53 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-16  6:43 [Qemu-devel] [PATCH 0/5] usb: make host adapters hot-pluggable Gerd Hoffmann
2014-09-16  6:43 ` [Qemu-devel] [PATCH 1/5] usb: tag xhci as hotpluggable Gerd Hoffmann
2014-09-16  6:43 ` [Qemu-devel] [PATCH 2/5] usb: tag standalone uhci " Gerd Hoffmann
2014-09-16  6:43 ` [Qemu-devel] [PATCH 3/5] usb: tag standalone ehci " Gerd Hoffmann
2014-09-16  6:43 ` [Qemu-devel] [PATCH 4/5] [wip] usb: tag ohci " Gerd Hoffmann
2014-09-16  6:43 ` Gerd Hoffmann [this message]
2014-09-16  7:40 ` [Qemu-devel] [PATCH 0/5] usb: make host adapters hot-pluggable Gonglei (Arei)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1410849819-24102-6-git-send-email-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=arei.gonglei@huawei.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).