[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [qemu-s390x] [PATCH 2/2] tests: Enable the very simple virtio tests
From: |
Christian Borntraeger |
Subject: |
Re: [qemu-s390x] [PATCH 2/2] tests: Enable the very simple virtio tests on s390x, too |
Date: |
Thu, 19 Oct 2017 15:49:59 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.0 |
Acked-by: Christian Borntraeger <address@hidden>
On 10/18/2017 04:20 PM, Thomas Huth wrote:
> These tests can easily be used on s390x, too. We just have to make
> sure to use the virtio-xxx-ccw devices instead of virtio-xxx-pci.
>
> Signed-off-by: Thomas Huth <address@hidden>
> ---
> tests/Makefile.include | 9 ++++++---
> tests/virtio-balloon-test.c | 8 +++++---
> tests/virtio-console-test.c | 19 +++++++++++--------
> tests/virtio-serial-test.c | 10 ++++++----
> 4 files changed, 28 insertions(+), 18 deletions(-)
>
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index 4ca15e6..70dc711 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -367,6 +367,9 @@ check-qtest-s390x-$(CONFIG_SLIRP) +=
> tests/test-netfilter$(EXESUF)
> check-qtest-s390x-$(CONFIG_POSIX) += tests/test-filter-mirror$(EXESUF)
> check-qtest-s390x-$(CONFIG_POSIX) += tests/test-filter-redirector$(EXESUF)
> check-qtest-s390x-y += tests/drive_del-test$(EXESUF)
> +check-qtest-s390x-y += tests/virtio-balloon-test$(EXESUF)
> +check-qtest-s390x-y += tests/virtio-console-test$(EXESUF)
> +check-qtest-s390x-y += tests/virtio-serial-test$(EXESUF)
>
> check-qtest-generic-y += tests/qom-test$(EXESUF)
> check-qtest-generic-y += tests/test-hmp$(EXESUF)
> @@ -754,14 +757,14 @@ tests/vmxnet3-test$(EXESUF): tests/vmxnet3-test.o
> tests/ne2000-test$(EXESUF): tests/ne2000-test.o
> tests/wdt_ib700-test$(EXESUF): tests/wdt_ib700-test.o
> tests/tco-test$(EXESUF): tests/tco-test.o $(libqos-pc-obj-y)
> -tests/virtio-balloon-test$(EXESUF): tests/virtio-balloon-test.o
> +tests/virtio-balloon-test$(EXESUF): tests/virtio-balloon-test.o
> $(libqos-virtio-obj-y)
> tests/virtio-blk-test$(EXESUF): tests/virtio-blk-test.o
> $(libqos-virtio-obj-y)
> tests/virtio-net-test$(EXESUF): tests/virtio-net-test.o $(libqos-pc-obj-y)
> $(libqos-virtio-obj-y)
> tests/virtio-rng-test$(EXESUF): tests/virtio-rng-test.o $(libqos-pc-obj-y)
> tests/virtio-scsi-test$(EXESUF): tests/virtio-scsi-test.o
> $(libqos-virtio-obj-y)
> tests/virtio-9p-test$(EXESUF): tests/virtio-9p-test.o $(libqos-virtio-obj-y)
> -tests/virtio-serial-test$(EXESUF): tests/virtio-serial-test.o
> -tests/virtio-console-test$(EXESUF): tests/virtio-console-test.o
> +tests/virtio-serial-test$(EXESUF): tests/virtio-serial-test.o
> $(libqos-virtio-obj-y)
> +tests/virtio-console-test$(EXESUF): tests/virtio-console-test.o
> $(libqos-virtio-obj-y)
> tests/tpci200-test$(EXESUF): tests/tpci200-test.o
> tests/display-vga-test$(EXESUF): tests/display-vga-test.o
> tests/ipoctal232-test$(EXESUF): tests/ipoctal232-test.o
> diff --git a/tests/virtio-balloon-test.c b/tests/virtio-balloon-test.c
> index 0d0046b..0a07e03 100644
> --- a/tests/virtio-balloon-test.c
> +++ b/tests/virtio-balloon-test.c
> @@ -9,9 +9,10 @@
>
> #include "qemu/osdep.h"
> #include "libqtest.h"
> +#include "libqos/virtio.h"
>
> /* Tests only initialization so far. TODO: Replace with functional tests */
> -static void pci_nop(void)
> +static void balloon_nop(void)
> {
> }
>
> @@ -20,9 +21,10 @@ int main(int argc, char **argv)
> int ret;
>
> g_test_init(&argc, &argv, NULL);
> - qtest_add_func("/virtio/balloon/pci/nop", pci_nop);
> + qtest_add_func("/virtio/balloon/nop", balloon_nop);
>
> - qtest_start("-device virtio-balloon-pci");
> + global_qtest = qtest_startf("-device virtio-balloon-%s",
> + qvirtio_get_dev_type());
> ret = g_test_run();
>
> qtest_end();
> diff --git a/tests/virtio-console-test.c b/tests/virtio-console-test.c
> index 1c3de07..945bae5 100644
> --- a/tests/virtio-console-test.c
> +++ b/tests/virtio-console-test.c
> @@ -9,27 +9,30 @@
>
> #include "qemu/osdep.h"
> #include "libqtest.h"
> +#include "libqos/virtio.h"
>
> /* Tests only initialization so far. TODO: Replace with functional tests */
> -static void console_pci_nop(void)
> +static void console_nop(void)
> {
> - qtest_start("-device virtio-serial-pci,id=vser0 "
> - "-device virtconsole,bus=vser0.0");
> + global_qtest = qtest_startf("-device virtio-serial-%s,id=vser0 "
> + "-device virtconsole,bus=vser0.0",
> + qvirtio_get_dev_type());
> qtest_end();
> }
>
> -static void serialport_pci_nop(void)
> +static void serialport_nop(void)
> {
> - qtest_start("-device virtio-serial-pci,id=vser0 "
> - "-device virtserialport,bus=vser0.0");
> + global_qtest = qtest_startf("-device virtio-serial-%s,id=vser0 "
> + "-device virtserialport,bus=vser0.0",
> + qvirtio_get_dev_type());
> qtest_end();
> }
>
> int main(int argc, char **argv)
> {
> g_test_init(&argc, &argv, NULL);
> - qtest_add_func("/virtio/console/pci/nop", console_pci_nop);
> - qtest_add_func("/virtio/serialport/pci/nop", serialport_pci_nop);
> + qtest_add_func("/virtio/console/nop", console_nop);
> + qtest_add_func("/virtio/serialport/nop", serialport_nop);
>
> return g_test_run();
> }
> diff --git a/tests/virtio-serial-test.c b/tests/virtio-serial-test.c
> index 7d1517d..7cc7060 100644
> --- a/tests/virtio-serial-test.c
> +++ b/tests/virtio-serial-test.c
> @@ -9,9 +9,10 @@
>
> #include "qemu/osdep.h"
> #include "libqtest.h"
> +#include "libqos/virtio.h"
>
> /* Tests only initialization so far. TODO: Replace with functional tests */
> -static void pci_nop(void)
> +static void virtio_serial_nop(void)
> {
> }
>
> @@ -27,10 +28,11 @@ int main(int argc, char **argv)
> int ret;
>
> g_test_init(&argc, &argv, NULL);
> - qtest_add_func("/virtio/serial/pci/nop", pci_nop);
> - qtest_add_func("/virtio/serial/pci/hotplug", hotplug);
> + qtest_add_func("/virtio/serial/nop", virtio_serial_nop);
> + qtest_add_func("/virtio/serial/hotplug", hotplug);
>
> - qtest_start("-device virtio-serial-pci");
> + global_qtest = qtest_startf("-device virtio-serial-%s",
> + qvirtio_get_dev_type());
> ret = g_test_run();
>
> qtest_end();
>
- [qemu-s390x] [PATCH 0/2] Enable the simple virtio tests on s390x, too, Thomas Huth, 2017/10/18
- [qemu-s390x] [PATCH 1/2] libqtest: Add qtest_[v]startf(), Thomas Huth, 2017/10/18
- [qemu-s390x] [PATCH 2/2] tests: Enable the very simple virtio tests on s390x, too, Thomas Huth, 2017/10/18
- Re: [qemu-s390x] [PATCH 0/2] Enable the simple virtio tests on s390x, too, Eric Blake, 2017/10/18
- Re: [qemu-s390x] [PATCH 0/2] Enable the simple virtio tests on s390x, too, Michael S. Tsirkin, 2017/10/19
- Re: [qemu-s390x] [PATCH 0/2] Enable the simple virtio tests on s390x, too, Cornelia Huck, 2017/10/19