Commit 2f84a92e authored by Thomas Huth's avatar Thomas Huth Committed by Cornelia Huck
Browse files

tests: Enable the drive_del test also on s390x 



We can use the drive_del test on s390x, too, to check that adding and
deleting also works fine with the virtio-ccw bus. But we have to make
sure that we use the devices with the "-ccw" suffix instead of the
"-pci" suffix for the virtio-ccw transport on s390x. Introduce a helper
function called qvirtio_get_dev_type() that returns the correct string
for the current architecture.

Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Message-Id: <1504190408-11143-1-git-send-email-thuth@redhat.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent 6c864622

tests/Makefile.include

+2 −1
Original line number Diff line number Diff line
@@ -366,6 +366,7 @@ check-qtest-s390x-$(CONFIG_SLIRP) += tests/pxe-test$(EXESUF) 
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-generic-y += tests/qom-test$(EXESUF)

check-qtest-generic-y += tests/test-hmp$(EXESUF)
@@ -766,7 +767,7 @@ tests/display-vga-test$(EXESUF): tests/display-vga-test.o 
tests/ipoctal232-test$(EXESUF): tests/ipoctal232-test.o

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

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

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

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

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

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

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

tests/drive_del-test.c

+16 −9
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 


#include "qemu/osdep.h"

#include "libqtest.h"

#include "libqos/virtio.h"



static void drive_add(void)

{
@@ -65,14 +66,14 @@ static void test_after_failed_device_add(void) 


    qtest_start("-drive if=none,id=drive0");



    /* Make device_add fail.  If this leaks the virtio-blk-pci device then a

    /* Make device_add fail. If this leaks the virtio-blk device then a

     * reference to drive0 will also be held (via qdev properties).

     */

    response = qmp("{'execute': 'device_add',"

                   " 'arguments': {"

                   "   'driver': 'virtio-blk-pci',"

                   "   'driver': 'virtio-blk-%s',"

                   "   'drive': 'drive0'"

                   "}}");

                   "}}", qvirtio_get_dev_type());

    g_assert(response);

    error = qdict_get_qdict(response, "error");

    g_assert_cmpstr(qdict_get_try_str(error, "class"), ==, "GenericError");
@@ -82,7 +83,7 @@ static void test_after_failed_device_add(void) 
    drive_del();



    /* Try to re-add the drive.  This fails with duplicate IDs if a leaked

     * virtio-blk-pci exists that holds a reference to the old drive0.

     * virtio-blk device exists that holds a reference to the old drive0.

     */

    drive_add();
@@ -91,10 +92,14 @@ static void test_after_failed_device_add(void) 


static void test_drive_del_device_del(void)

{

    char *args;



    /* Start with a drive used by a device that unplugs instantaneously */

    qtest_start("-drive if=none,id=drive0,file=null-co://,format=raw"

                " -device virtio-scsi-pci"

                " -device scsi-hd,drive=drive0,id=dev0");

    args = g_strdup_printf("-drive if=none,id=drive0,file=null-co://,format=raw"

                           " -device virtio-scsi-%s"

                           " -device scsi-hd,drive=drive0,id=dev0",

                           qvirtio_get_dev_type());

    qtest_start(args);



    /*

     * Delete the drive, and then the device
@@ -104,6 +109,7 @@ static void test_drive_del_device_del(void) 
    device_del();



    qtest_end();

    g_free(args);

}



int main(int argc, char **argv)
@@ -114,9 +120,10 @@ int main(int argc, char **argv) 


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



    /* TODO I guess any arch with PCI would do */

    /* 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, "ppc") || !strcmp(arch, "ppc64") ||

        !strcmp(arch, "s390x")) {

        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

+17 −0
Original line number Diff line number Diff line
@@ -339,3 +339,20 @@ void qvirtqueue_set_used_event(QVirtQueue *vq, uint16_t idx) 
    /* vq->avail->used_event */

    writew(vq->avail + 4 + (2 * vq->size), idx);

}



/*

 * qvirtio_get_dev_type:

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

 */

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";

    }

}

tests/libqos/virtio.h

+3 −0
Original line number Diff line number Diff line
@@ -143,4 +143,7 @@ void qvirtqueue_kick(QVirtioDevice *d, QVirtQueue *vq, uint32_t free_head); 
bool qvirtqueue_get_buf(QVirtQueue *vq, uint32_t *desc_idx);



void qvirtqueue_set_used_event(QVirtQueue *vq, uint16_t idx);



const char *qvirtio_get_dev_type(void);



#endif