Re: [Qemu-devel] [PATCH 1/5] tests: add OHCI qtest

[Andreas Färber]

Am 17.06.2014 10:03, schrieb address@hidden:
> From: Gonglei <address@hidden>
> 
> add ohci controller hotplug/unplug qtest
> 
> Signed-off-by: Gonglei <address@hidden>
> ---
>  MAINTAINERS               |  2 +-
>  tests/Makefile            |  3 +++
>  tests/usb-hcd-ohci-test.c | 41 +++++++++++++++++++++++++++++++++++++++++
>  3 files changed, 45 insertions(+), 1 deletion(-)
>  create mode 100644 tests/usb-hcd-ohci-test.c
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 51a6f51..2c81323 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -608,7 +608,7 @@ USB
>  M: Gerd Hoffmann <address@hidden>
>  S: Maintained
>  F: hw/usb/*
> -F: tests/usb-hcd-ehci-test.c
> +F: tests/usb-hcd*

usb-*-test.c?

>  
>  VFIO
>  M: Alex Williamson <address@hidden>
> diff --git a/tests/Makefile b/tests/Makefile
> index 361bb7b..b1fbfb6 100644
> --- a/tests/Makefile
> +++ b/tests/Makefile
> @@ -151,6 +151,8 @@ check-qtest-i386-y += tests/i82801b11-test$(EXESUF)
>  gcov-files-i386-y += hw/pci-bridge/i82801b11.c
>  check-qtest-i386-y += tests/ioh3420-test$(EXESUF)
>  gcov-files-i386-y += hw/pci-bridge/ioh3420.c
> +check-qtest-i386-y += tests/usb-hcd-ohci-test$(EXESUF)
> +gcov-files-i386-y += hw/usb/hcd-ohci.c
>  check-qtest-i386-y += tests/usb-hcd-ehci-test$(EXESUF)
>  gcov-files-i386-y += hw/usb/hcd-ehci.c
>  gcov-files-i386-y += hw/usb/hcd-uhci.c
> @@ -321,6 +323,7 @@ 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-ehci-test$(EXESUF): tests/usb-hcd-ehci-test.o 
> $(libqos-pc-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-ohci-test.c b/tests/usb-hcd-ohci-test.c
> new file mode 100644
> index 0000000..bb54346
> --- /dev/null
> +++ b/tests/usb-hcd-ohci-test.c
> @@ -0,0 +1,41 @@
> +/*
> + * QTest testcase for USB OHCI controller
> + *
> + * 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 test_ohci_hotplug(void)
> +{
> +    qtest_start("");
> +
> +    /* hotplug an ohci controller */
> +    qmp_exec_hmp_cmd("", "device_add pci-ohci,id=ohci");
> +
> +    /* hot unplug an ohci controller */
> +    qmp_exec_hmp_cmd("", "device_del ohci");

Please use QMP for device_add/del, it's safer with regards to response
parsing.

> +
> +    qtest_end();
> +}
> +
> +
> +int main(int argc, char **argv)
> +{
> +    int ret;
> +
> +    g_test_init(&argc, &argv, NULL);
> +
> +    qtest_add_func("/ohci/pci/ohci-hotplug", test_ohci_hotplug);

Might it make sense to also include a traditional "cold-plug" test? It
could be reused for ppc64 (sPAPR), where the q35 companion-controller
snippet probably doesn't apply.

> +
> +    ret = g_test_run();
> +
> +    return ret;
> +}

Regards,
Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg