Commit 19e3d979 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

tests: move virtio entirely to qos-test 



The only remaining test that needs libqos-virtio-obj-y is drive_del-test,
which really only needs a function.  Move that function to the test
and remove libqos-virtio-obj-y.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 6e682046

tests/Makefile.include

+4 −5
Original line number Diff line number Diff line
@@ -161,7 +161,6 @@ check-qtest-pci-$(CONFIG_NE2000_PCI) += tests/ne2000-test$(EXESUF) 
check-qtest-pci-$(CONFIG_NVME_PCI) += tests/nvme-test$(EXESUF)

check-qtest-pci-$(CONFIG_AC97) += tests/ac97-test$(EXESUF)

check-qtest-pci-$(CONFIG_ES1370) += tests/es1370-test$(EXESUF)

check-qtest-pci-$(CONFIG_VIRTIO) += $(check-qtest-virtio-y)

check-qtest-pci-$(CONFIG_IPACK) += tests/tpci200-test$(EXESUF)

check-qtest-pci-$(CONFIG_IPACK) += $(check-qtest-ipack-y)

check-qtest-pci-$(CONFIG_VGA) += tests/display-vga-test$(EXESUF)
@@ -254,7 +253,6 @@ check-qtest-ppc64-$(CONFIG_SLIRP) += tests/pxe-test$(EXESUF) 
check-qtest-ppc64-$(CONFIG_USB_OHCI) += tests/usb-hcd-ohci-test$(EXESUF)

check-qtest-ppc64-$(CONFIG_USB_UHCI) += tests/usb-hcd-uhci-test$(EXESUF)

check-qtest-ppc64-$(CONFIG_USB_XHCI_NEC) += tests/usb-hcd-xhci-test$(EXESUF)

check-qtest-ppc64-$(CONFIG_VIRTIO) += $(check-qtest-virtio-y)

check-qtest-ppc64-$(CONFIG_SLIRP) += tests/test-netfilter$(EXESUF)

check-qtest-ppc64-$(CONFIG_POSIX) += tests/test-filter-mirror$(EXESUF)

check-qtest-ppc64-$(CONFIG_RTL8139_PCI) += tests/test-filter-redirector$(EXESUF)
@@ -728,18 +726,19 @@ libqos-pc-obj-y += tests/libqos/ahci.o 
libqos-omap-obj-y = $(libqos-obj-y) tests/libqos/i2c-omap.o

libqos-imx-obj-y = $(libqos-obj-y) tests/libqos/i2c-imx.o

libqos-usb-obj-y = $(libqos-spapr-obj-y) $(libqos-pc-obj-y) tests/libqos/usb.o

libqos-virtio-obj-y = $(libqos-spapr-obj-y) $(libqos-pc-obj-y) tests/libqos/virtio.o tests/libqos/virtio-pci.o tests/libqos/virtio-mmio.o



# Devices

qos-test-obj-y = tests/qos-test.o $(libqgraph-obj-y)

qos-test-obj-y += $(libqos-pc-obj-y) $(libqos-spapr-obj-y)

qos-test-obj-y += tests/libqos/e1000e.o

qos-test-obj-y += tests/libqos/sdhci.o

qos-test-obj-y += $(libqos-virtio-obj-y)

qos-test-obj-y += tests/libqos/virtio.o

qos-test-obj-$(CONFIG_VIRTFS) += tests/libqos/virtio-9p.o

qos-test-obj-y += tests/libqos/virtio-balloon.o

qos-test-obj-y += tests/libqos/virtio-blk.o

qos-test-obj-y += tests/libqos/virtio-mmio.o

qos-test-obj-y += tests/libqos/virtio-net.o

qos-test-obj-y += tests/libqos/virtio-pci.o

qos-test-obj-y += tests/libqos/virtio-rng.o

qos-test-obj-y += tests/libqos/virtio-scsi.o

qos-test-obj-y += tests/libqos/virtio-serial.o
@@ -819,7 +818,7 @@ tests/qom-test$(EXESUF): tests/qom-test.o 
tests/test-hmp$(EXESUF): tests/test-hmp.o

tests/machine-none-test$(EXESUF): tests/machine-none-test.o

tests/device-plug-test$(EXESUF): tests/device-plug-test.o

tests/drive_del-test$(EXESUF): tests/drive_del-test.o $(libqos-virtio-obj-y)

tests/drive_del-test$(EXESUF): tests/drive_del-test.o

tests/nvme-test$(EXESUF): tests/nvme-test.o $(libqos-pc-obj-y)

tests/pvpanic-test$(EXESUF): tests/pvpanic-test.o

tests/i82801b11-test$(EXESUF): tests/i82801b11-test.o

tests/drive_del-test.c

+19 −6
Original line number Diff line number Diff line
@@ -63,6 +63,24 @@ static void test_drive_without_dev(void) 
    qtest_end();

}



/*

 * qvirtio_get_dev_type:

 * Returns: the preferred virtio bus/device type for the current architecture.

 * TODO: delete this

 */

static const char *qvirtio_get_dev_type(void)

{

    const char *arch = qtest_get_arch();



    if (g_str_equal(arch, "arm") || g_str_equal(arch, "aarch64")) {

        return "device";  /* for virtio-mmio */

    } else if (g_str_equal(arch, "s390x")) {

        return "ccw";

    } else {

        return "pci";

    }

}



static void test_after_failed_device_add(void)

{

    char driver[32];
@@ -119,16 +137,11 @@ static void test_drive_del_device_del(void) 


int main(int argc, char **argv)

{

    const char *arch = qtest_get_arch();



    g_test_init(&argc, &argv, NULL);



    qtest_add_func("/drive_del/without-dev", test_drive_without_dev);



    /* TODO I guess any arch with a hot-pluggable virtio bus would do */

    if (!strcmp(arch, "i386") || !strcmp(arch, "x86_64") ||

        !strcmp(arch, "ppc") || !strcmp(arch, "ppc64") ||

        !strcmp(arch, "s390x")) {

    if (qvirtio_get_dev_type() != NULL) {

        qtest_add_func("/drive_del/after_failed_device_add",

                       test_after_failed_device_add);

        qtest_add_func("/blockdev/drive_del_device_del",

tests/libqos/virtio.c

+0 −18
Original line number Diff line number Diff line
@@ -350,24 +350,6 @@ void qvirtqueue_set_used_event(QVirtQueue *vq, uint16_t idx) 
    writew(vq->avail + 4 + (2 * vq->size), idx);

}



/*

 * qvirtio_get_dev_type:

 * Returns: the preferred virtio bus/device type for the current architecture.

 * TODO: delete this

 */

const char *qvirtio_get_dev_type(void)

{

    const char *arch = qtest_get_arch();



    if (g_str_equal(arch, "arm") || g_str_equal(arch, "aarch64")) {

        return "device";  /* for virtio-mmio */

    } else if (g_str_equal(arch, "s390x")) {

        return "ccw";

    } else {

        return "pci";

    }

}



void qvirtio_start_device(QVirtioDevice *vdev)

{

    qvirtio_reset(vdev);

tests/libqos/virtio.h

+0 −1
Original line number Diff line number Diff line
@@ -142,7 +142,6 @@ bool qvirtqueue_get_buf(QVirtQueue *vq, uint32_t *desc_idx, uint32_t *len); 


void qvirtqueue_set_used_event(QVirtQueue *vq, uint16_t idx);



const char *qvirtio_get_dev_type(void);

void qvirtio_start_device(QVirtioDevice *vdev);



#endif