Re: [Qemu-devel] [PATCH v4 4/4] tests: add usb hcds hotplugging qtest

[Amos Kong]

On Mon, Jun 23, 2014 at 07:53:54PM +0800, address@hidden wrote:
> From: Gonglei <address@hidden>
> 
> Because of we now support usb hcds hotplugging, and
> collect all hcds hotplugging tests into one file
> for code sharing.
> 
> Signed-off-by: Gonglei <address@hidden>
> ---
>  tests/Makefile               |  2 +
>  tests/usb-hcd-hotplug-test.c | 88 
> ++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 90 insertions(+)
>  create mode 100644 tests/usb-hcd-hotplug-test.c
> 
> diff --git a/tests/Makefile b/tests/Makefile
> index 6a78ade..f0362f7 100644
> --- a/tests/Makefile
> +++ b/tests/Makefile
> @@ -161,6 +161,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-y += tests/vhost-user-test$(EXESUF)
>  check-qtest-x86_64-y = $(check-qtest-i386-y)
>  gcov-files-i386-y += i386-softmmu/hw/timer/mc146818rtc.c
> @@ -331,6 +332,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 libqemuutil.a libqemustub.a
>  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..04bea97
> --- /dev/null
> +++ b/tests/usb-hcd-hotplug-test.c
> @@ -0,0 +1,88 @@
> +/*
> + * 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;
> +
> +    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 */
> +    response = qmp("{\"execute\": \"device_add\","
> +                       " \"arguments\": {"
> +                       "   \"driver\": \"usb-tablet\","
> +                       "   \"bus\": \"%s.0\""
> +                       "}}", id);
> +    g_assert(response);
> +    g_assert(!qdict_haskey(response, "error"));
> +    QDECREF(response);

Do you need to unhot-plug usb-tablet first, before unhot-plug usb host
adapter?

> +    /* 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.7.12.4
> 

-- 
                        Amos.