Commit 8f41a3a8 authored by Emanuele Giuseppe Esposito's avatar Emanuele Giuseppe Esposito Committed by Paolo Bonzini
Browse files

tests/libqos: virtio-scsi driver and interface nodes 



Add qgraph nodes for virtio-scsi-pci and virtio-scsi-device.
Both nodes produce virtio-scsi, but virtio-scsi-pci receives
a pci-bus and uses virtio-pci QOSGraphObject and its functions,
while virtio-scsi-device receives a virtio and implements
its own functions

Signed-off-by: default avatarEmanuele Giuseppe Esposito <e.emanuelegiuseppe@gmail.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent a3ebd6e0

tests/Makefile.include

+1 −0
Original line number Diff line number Diff line
@@ -743,6 +743,7 @@ 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-net.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



# Machines

tests/libqos/virtio-scsi.c

0 → 100644
+117 −0
Original line number Diff line number Diff line 
/*

 * libqos driver framework

 *

 * Copyright (c) 2018 Emanuele Giuseppe Esposito <e.emanuelegiuseppe@gmail.com>

 *

 * This library is free software; you can redistribute it and/or

 * modify it under the terms of the GNU Lesser General Public

 * License version 2 as published by the Free Software Foundation.

 *

 * This library is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * Lesser General Public License for more details.

 *

 * You should have received a copy of the GNU Lesser General Public

 * License along with this library; if not, see <http://www.gnu.org/licenses/>

 */



#include "qemu/osdep.h"

#include "libqtest.h"

#include "standard-headers/linux/virtio_ids.h"

#include "libqos/qgraph.h"

#include "libqos/virtio-scsi.h"



/* virtio-scsi-device */

static void *qvirtio_scsi_get_driver(QVirtioSCSI *v_scsi,

                                     const char *interface)

{

    if (!g_strcmp0(interface, "virtio-scsi")) {

        return v_scsi;

    }

    if (!g_strcmp0(interface, "virtio")) {

        return v_scsi->vdev;

    }



    fprintf(stderr, "%s not present in virtio-scsi-device\n", interface);

    g_assert_not_reached();

}



static void *qvirtio_scsi_device_get_driver(void *object,

                                            const char *interface)

{

    QVirtioSCSIDevice *v_scsi = object;

    return qvirtio_scsi_get_driver(&v_scsi->scsi, interface);

}



static void *virtio_scsi_device_create(void *virtio_dev,

                                          QGuestAllocator *t_alloc,

                                          void *addr)

{

    QVirtioSCSIDevice *virtio_bdevice = g_new0(QVirtioSCSIDevice, 1);

    QVirtioSCSI *interface = &virtio_bdevice->scsi;



    interface->vdev = virtio_dev;



    virtio_bdevice->obj.get_driver = qvirtio_scsi_device_get_driver;



    return &virtio_bdevice->obj;

}



/* virtio-scsi-pci */

static void *qvirtio_scsi_pci_get_driver(void *object,

                                         const char *interface)

{

    QVirtioSCSIPCI *v_scsi = object;

    if (!g_strcmp0(interface, "pci-device")) {

        return v_scsi->pci_vdev.pdev;

    }

    return qvirtio_scsi_get_driver(&v_scsi->scsi, interface);

}



static void *virtio_scsi_pci_create(void *pci_bus,

                                    QGuestAllocator *t_alloc,

                                    void *addr)

{

    QVirtioSCSIPCI *virtio_spci = g_new0(QVirtioSCSIPCI, 1);

    QVirtioSCSI *interface = &virtio_spci->scsi;

    QOSGraphObject *obj = &virtio_spci->pci_vdev.obj;



    virtio_pci_init(&virtio_spci->pci_vdev, pci_bus, addr);

    interface->vdev = &virtio_spci->pci_vdev.vdev;



    g_assert_cmphex(interface->vdev->device_type, ==, VIRTIO_ID_SCSI);



    obj->get_driver = qvirtio_scsi_pci_get_driver;



    return obj;

}



static void virtio_scsi_register_nodes(void)

{

    QPCIAddress addr = {

        .devfn = QPCI_DEVFN(4, 0),

    };



    QOSGraphEdgeOptions opts = {

        .before_cmd_line = "-drive id=drv0,if=none,file=null-co://,format=raw",

        .after_cmd_line = "-device scsi-hd,bus=vs0.0,drive=drv0",

    };



    /* virtio-scsi-device */

    opts.extra_device_opts = "id=vs0";

    qos_node_create_driver("virtio-scsi-device",

                            virtio_scsi_device_create);

    qos_node_consumes("virtio-scsi-device", "virtio-bus", &opts);

    qos_node_produces("virtio-scsi-device", "virtio-scsi");



    /* virtio-scsi-pci */

    opts.extra_device_opts = "id=vs0,addr=04.0";

    add_qpci_address(&opts, &addr);

    qos_node_create_driver("virtio-scsi-pci", virtio_scsi_pci_create);

    qos_node_consumes("virtio-scsi-pci", "pci-bus", &opts);

    qos_node_produces("virtio-scsi-pci", "pci-device");

    qos_node_produces("virtio-scsi-pci", "virtio-scsi");

}



libqos_init(virtio_scsi_register_nodes);

tests/libqos/virtio-scsi.h

0 → 100644
+39 −0
Original line number Diff line number Diff line 
/*

 * libqos driver framework

 *

 * Copyright (c) 2018 Emanuele Giuseppe Esposito <e.emanuelegiuseppe@gmail.com>

 *

 * This library is free software; you can redistribute it and/or

 * modify it under the terms of the GNU Lesser General Public

 * License version 2 as published by the Free Software Foundation.

 *

 * This library is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * Lesser General Public License for more details.

 *

 * You should have received a copy of the GNU Lesser General Public

 * License along with this library; if not, see <http://www.gnu.org/licenses/>

 */



#include "libqos/qgraph.h"

#include "libqos/virtio.h"

#include "libqos/virtio-pci.h"



typedef struct QVirtioSCSI QVirtioSCSI;

typedef struct QVirtioSCSIPCI QVirtioSCSIPCI;

typedef struct QVirtioSCSIDevice QVirtioSCSIDevice;



struct QVirtioSCSI {

    QVirtioDevice *vdev;

};



struct QVirtioSCSIPCI {

    QVirtioPCIDevice pci_vdev;

    QVirtioSCSI scsi;

};



struct QVirtioSCSIDevice {

    QOSGraphObject obj;

    QVirtioSCSI scsi;

};