system/qemu
system/qemu
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/qemu synced 2024-11-05 20:35:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

tests: virtio: separate ccw tests from libqos

Browse source 
Because qtest does not support s390 channel I/O, s390 only performs smoke tests on
those few devices that do not have any functional tests.  Therefore, every time we
add functional tests for a virtio device, the choice is between removing
those tests from the s390 suite (so that s390 actually _loses_ coverage)
or sprinkling the test with architecture checks.

This patch simply creates a ccw-specific test that only performs smoke tests on
all virtio-ccw devices.  If channel I/O support is ever added to qtest and libqos,
then this file can go away.  In the meanwhile, it simplifies maintenance and
makes sure that all virtio devices are tested.

Acked-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2018-08-01 15:26:22 +02:00
parent 659b11e7a7
commit 06d09a018f
2 changed files with 112 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tests/Makefile.include
View file

@ -402,9 +402,7 @@ 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-s390x-y += tests/virtio-ccw-test$(EXESUF)
check-qtest-s390x-y += tests/cpu-plug-test$(EXESUF)
check-qtest-generic-y += tests/machine-none-test$(EXESUF)
@ -809,6 +807,7 @@ 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 $(libqos-virtio-obj-y)
tests/virtio-blk-test$(EXESUF): tests/virtio-blk-test.o $(libqos-virtio-obj-y)
tests/virtio-ccw-test$(EXESUF): tests/virtio-ccw-test.o
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)

110
tests/virtio-ccw-test.c Normal file
View file

@ -0,0 +1,110 @@
/*
* QTest testcase for VirtIO CCW
*
* Copyright (c) 2014 SUSE LINUX Products GmbH
* Copyright (c) 2018 Red Hat, Inc.
*
* This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory.
*/
/* Until we have a full libqos implementation of virtio-ccw (which requires
* also to add support for I/O channels to qtest), we can only do simple
* tests that initialize the devices.
*/
#include "qemu/osdep.h"
#include "libqtest.h"
#include "libqos/virtio.h"
static void virtio_balloon_nop(void)
{
global_qtest = qtest_initf("-device virtio-balloon-ccw");
qtest_end();
}
static void virtconsole_nop(void)
{
global_qtest = qtest_initf("-device virtio-serial-ccw,id=vser0 "
"-device virtconsole,bus=vser0.0");
qtest_end();
}
static void virtserialport_nop(void)
{
global_qtest = qtest_initf("-device virtio-serial-ccw,id=vser0 "
"-device virtserialport,bus=vser0.0");
qtest_end();
}
static void virtio_serial_nop(void)
{
global_qtest = qtest_initf("-device virtio-serial-ccw");
qtest_end();
}
static void virtio_serial_hotplug(void)
{
global_qtest = qtest_initf("-device virtio-serial-ccw");
qtest_qmp_device_add("virtserialport", "hp-port", "{}");
qtest_qmp_device_del("hp-port");
qtest_end();
}
static void virtio_blk_nop(void)
{
global_qtest = qtest_initf("-drive if=none,id=drv0,file=null-co://,format=raw "
"-device virtio-blk-ccw,drive=drv0");
qtest_end();
}
static void virtio_net_nop(void)
{
global_qtest = qtest_initf("-device virtio-net-ccw");
qtest_end();
}
static void virtio_rng_nop(void)
{
global_qtest = qtest_initf("-device virtio-rng-ccw");
qtest_end();
}
static void virtio_scsi_nop(void)
{
global_qtest = qtest_initf("-device virtio-scsi-ccw");
qtest_end();
}
static void virtio_scsi_hotplug(void)
{
global_qtest = qtest_initf("-drive if=none,id=drv0,file=null-co://,format=raw "
"-drive if=none,id=drv1,file=null-co://,format=raw "
"-device virtio-scsi-ccw "
"-device scsi-hd,drive=drv0");
qtest_qmp_device_add("scsi-hd", "scsihd", "{'drive': 'drv1'}");
qtest_qmp_device_del("scsihd");
qtest_end();
}
int main(int argc, char **argv)
{
int ret;
g_test_init(&argc, &argv, NULL);
qtest_add_func("/virtio/balloon/nop", virtio_balloon_nop);
qtest_add_func("/virtio/console/nop", virtconsole_nop);
qtest_add_func("/virtio/serialport/nop", virtserialport_nop);
qtest_add_func("/virtio/serial/nop", virtio_serial_nop);
qtest_add_func("/virtio/serial/hotplug", virtio_serial_hotplug);
qtest_add_func("/virtio/block/nop", virtio_blk_nop);
qtest_add_func("/virtio/net/nop", virtio_net_nop);
qtest_add_func("/virtio/rng/nop", virtio_rng_nop);
qtest_add_func("/virtio/scsi/nop", virtio_scsi_nop);
qtest_add_func("/virtio/scsi/hotplug", virtio_scsi_hotplug);
ret = g_test_run();
return ret;
}