Commit 50787628 authored by Nicholas Bellinger's avatar Nicholas Bellinger Committed by Paolo Bonzini
Browse files

vhost-scsi-pci: new device supporting the tcm_vhost Linux kernel module 



Cc: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
Signed-off-by: default avatarAsias He <asias@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 5e9be92d

hw/virtio/virtio-pci.c

+60 −0
Original line number Diff line number Diff line
@@ -1285,6 +1285,63 @@ static const TypeInfo virtio_scsi_pci_info = { 
    .class_init    = virtio_scsi_pci_class_init,

};



/* vhost-scsi-pci */



#ifdef CONFIG_VHOST_SCSI

static Property vhost_scsi_pci_properties[] = {

    DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors,

                       DEV_NVECTORS_UNSPECIFIED),

    DEFINE_VIRTIO_COMMON_FEATURES(VirtIOPCIProxy, host_features),

    DEFINE_VHOST_SCSI_PROPERTIES(VHostSCSIPCI, vdev.parent_obj.conf),

    DEFINE_PROP_END_OF_LIST(),

};



static int vhost_scsi_pci_init_pci(VirtIOPCIProxy *vpci_dev)

{

    VHostSCSIPCI *dev = VHOST_SCSI_PCI(vpci_dev);

    DeviceState *vdev = DEVICE(&dev->vdev);

    VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(vdev);



    if (vpci_dev->nvectors == DEV_NVECTORS_UNSPECIFIED) {

        vpci_dev->nvectors = vs->conf.num_queues + 3;

    }



    qdev_set_parent_bus(vdev, BUS(&vpci_dev->bus));

    if (qdev_init(vdev) < 0) {

        return -1;

    }

    return 0;

}



static void vhost_scsi_pci_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    VirtioPCIClass *k = VIRTIO_PCI_CLASS(klass);

    PCIDeviceClass *pcidev_k = PCI_DEVICE_CLASS(klass);

    k->init = vhost_scsi_pci_init_pci;

    dc->props = vhost_scsi_pci_properties;

    pcidev_k->vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET;

    pcidev_k->device_id = PCI_DEVICE_ID_VIRTIO_SCSI;

    pcidev_k->revision = 0x00;

    pcidev_k->class_id = PCI_CLASS_STORAGE_SCSI;

}



static void vhost_scsi_pci_instance_init(Object *obj)

{

    VHostSCSIPCI *dev = VHOST_SCSI_PCI(obj);

    object_initialize(OBJECT(&dev->vdev), TYPE_VHOST_SCSI);

    object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);

}



static const TypeInfo vhost_scsi_pci_info = {

    .name          = TYPE_VHOST_SCSI_PCI,

    .parent        = TYPE_VIRTIO_PCI,

    .instance_size = sizeof(VHostSCSIPCI),

    .instance_init = vhost_scsi_pci_instance_init,

    .class_init    = vhost_scsi_pci_class_init,

};

#endif



/* virtio-balloon-pci */



static void balloon_pci_stats_get_all(Object *obj, struct Visitor *v,
@@ -1541,6 +1598,9 @@ static void virtio_pci_register_types(void) 
    type_register_static(&virtio_balloon_pci_info);

    type_register_static(&virtio_serial_pci_info);

    type_register_static(&virtio_net_pci_info);

#ifdef CONFIG_VHOST_SCSI

    type_register_static(&vhost_scsi_pci_info);

#endif

}



type_init(virtio_pci_register_types)

hw/virtio/virtio-pci.h

+18 −0
Original line number Diff line number Diff line
@@ -24,6 +24,9 @@ 
#include "hw/virtio/virtio-balloon.h"

#include "hw/virtio/virtio-bus.h"

#include "hw/virtio/virtio-9p.h"

#ifdef CONFIG_VHOST_SCSI

#include "hw/virtio/vhost-scsi.h"

#endif



typedef struct VirtIOPCIProxy VirtIOPCIProxy;

typedef struct VirtIOBlkPCI VirtIOBlkPCI;
@@ -31,6 +34,7 @@ typedef struct VirtIOSCSIPCI VirtIOSCSIPCI; 
typedef struct VirtIOBalloonPCI VirtIOBalloonPCI;

typedef struct VirtIOSerialPCI VirtIOSerialPCI;

typedef struct VirtIONetPCI VirtIONetPCI;

typedef struct VHostSCSIPCI VHostSCSIPCI;



/* virtio-pci-bus */
@@ -104,6 +108,20 @@ struct VirtIOSCSIPCI { 
    VirtIOSCSI vdev;

};



#ifdef CONFIG_VHOST_SCSI

/*

 * vhost-scsi-pci: This extends VirtioPCIProxy.

 */

#define TYPE_VHOST_SCSI_PCI "vhost-scsi-pci"

#define VHOST_SCSI_PCI(obj) \

        OBJECT_CHECK(VHostSCSIPCI, (obj), TYPE_VHOST_SCSI_PCI)



struct VHostSCSIPCI {

    VirtIOPCIProxy parent_obj;

    VHostSCSI vdev;

};

#endif



/*

 * virtio-blk-pci: This extends VirtioPCIProxy.

 */