Commit 693510dd authored by Juan Quintela's avatar Juan Quintela Committed by Michael S. Tsirkin
Browse files

virtio: split vhost user scsi bits from virtio-pci 



Reviewed-by: default avatarLaurent Vivier <lvivier@redhat.com>
Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent f170c5ef

hw/virtio/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock.o 
ifeq ($(CONFIG_PCI),y)

obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock-pci.o

obj-$(CONFIG_VHOST_USER_BLK) += vhost-user-blk-pci.o

obj-$(CONFIG_VHOST_USER_SCSI) += vhost-user-scsi-pci.o

obj-$(CONFIG_VIRTIO_INPUT_HOST) += virtio-input-host-pci.o

obj-$(CONFIG_VIRTIO_INPUT) += virtio-input-pci.o

obj-$(CONFIG_VIRTIO_RNG) += virtio-rng-pci.o

hw/virtio/vhost-user-scsi-pci.c

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

 * Vhost user scsi PCI Bindings

 *

 * Copyright (c) 2016 Nutanix Inc. All rights reserved.

 *

 * Author:

 *  Felipe Franciosi <felipe@nutanix.com>

 *

 * This work is largely based on the "vhost-scsi" implementation by:

 *  Stefan Hajnoczi    <stefanha@linux.vnet.ibm.com>

 *  Nicholas Bellinger <nab@risingtidesystems.com>

 *

 * This work is licensed under the terms of the GNU LGPL, version 2 or later.

 * See the COPYING.LIB file in the top-level directory.

 *

 */



#include "qemu/osdep.h"



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

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

#include "hw/virtio/virtio.h"

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

#include "hw/pci/pci.h"

#include "qapi/error.h"

#include "qemu/error-report.h"

#include "hw/pci/msi.h"

#include "hw/pci/msix.h"

#include "hw/loader.h"

#include "sysemu/kvm.h"

#include "virtio-pci.h"



typedef struct VHostUserSCSIPCI VHostUserSCSIPCI;



#define TYPE_VHOST_USER_SCSI_PCI "vhost-user-scsi-pci-base"

#define VHOST_USER_SCSI_PCI(obj) \

        OBJECT_CHECK(VHostUserSCSIPCI, (obj), TYPE_VHOST_USER_SCSI_PCI)



struct VHostUserSCSIPCI {

    VirtIOPCIProxy parent_obj;

    VHostUserSCSI vdev;

};



static Property vhost_user_scsi_pci_properties[] = {

    DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors,

                       DEV_NVECTORS_UNSPECIFIED),

    DEFINE_PROP_END_OF_LIST(),

};



static void vhost_user_scsi_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)

{

    VHostUserSCSIPCI *dev = VHOST_USER_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));

    object_property_set_bool(OBJECT(vdev), true, "realized", errp);

}



static void vhost_user_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->realize = vhost_user_scsi_pci_realize;

    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);

    dc->props = vhost_user_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_user_scsi_pci_instance_init(Object *obj)

{

    VHostUserSCSIPCI *dev = VHOST_USER_SCSI_PCI(obj);



    virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),

                                TYPE_VHOST_USER_SCSI);

    object_property_add_alias(obj, "bootindex", OBJECT(&dev->vdev),

                              "bootindex", &error_abort);

}



static const VirtioPCIDeviceTypeInfo vhost_user_scsi_pci_info = {

    .base_name             = TYPE_VHOST_USER_SCSI_PCI,

    .generic_name          = "vhost-user-scsi-pci",

    .transitional_name     = "vhost-user-scsi-pci-transitional",

    .non_transitional_name = "vhost-user-scsi-pci-non-transitional",

    .instance_size = sizeof(VHostUserSCSIPCI),

    .instance_init = vhost_user_scsi_pci_instance_init,

    .class_init    = vhost_user_scsi_pci_class_init,

};



static void vhost_user_scsi_pci_register(void)

{

    virtio_pci_types_register(&vhost_user_scsi_pci_info);

}



type_init(vhost_user_scsi_pci_register)

hw/virtio/virtio-pci.c

+0 −60
Original line number Diff line number Diff line
@@ -2188,63 +2188,6 @@ static const VirtioPCIDeviceTypeInfo vhost_scsi_pci_info = { 
};

#endif



#if defined(CONFIG_VHOST_USER) && defined(CONFIG_LINUX)

/* vhost-user-scsi-pci */

static Property vhost_user_scsi_pci_properties[] = {

    DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors,

                       DEV_NVECTORS_UNSPECIFIED),

    DEFINE_PROP_END_OF_LIST(),

};



static void vhost_user_scsi_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)

{

    VHostUserSCSIPCI *dev = VHOST_USER_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));

    object_property_set_bool(OBJECT(vdev), true, "realized", errp);

}



static void vhost_user_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->realize = vhost_user_scsi_pci_realize;

    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);

    dc->props = vhost_user_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_user_scsi_pci_instance_init(Object *obj)

{

    VHostUserSCSIPCI *dev = VHOST_USER_SCSI_PCI(obj);



    virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),

                                TYPE_VHOST_USER_SCSI);

    object_property_add_alias(obj, "bootindex", OBJECT(&dev->vdev),

                              "bootindex", &error_abort);

}



static const VirtioPCIDeviceTypeInfo vhost_user_scsi_pci_info = {

    .base_name             = TYPE_VHOST_USER_SCSI_PCI,

    .generic_name          = "vhost-user-scsi-pci",

    .transitional_name     = "vhost-user-scsi-pci-transitional",

    .non_transitional_name = "vhost-user-scsi-pci-non-transitional",

    .instance_size = sizeof(VHostUserSCSIPCI),

    .instance_init = vhost_user_scsi_pci_instance_init,

    .class_init    = vhost_user_scsi_pci_class_init,

};

#endif



/* virtio-serial-pci */



static void virtio_serial_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
@@ -2436,9 +2379,6 @@ static void virtio_pci_register_types(void) 
#ifdef CONFIG_VHOST_SCSI

    virtio_pci_types_register(&vhost_scsi_pci_info);

#endif

#if defined(CONFIG_VHOST_USER) && defined(CONFIG_LINUX)

    virtio_pci_types_register(&vhost_user_scsi_pci_info);

#endif

}



type_init(virtio_pci_register_types)

hw/virtio/virtio-pci.h

+0 −11
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include "hw/virtio/virtio-bus.h"

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

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

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



#ifdef CONFIG_VHOST_SCSI

#include "hw/virtio/vhost-scsi.h"
@@ -35,7 +34,6 @@ typedef struct VirtIOSCSIPCI VirtIOSCSIPCI; 
typedef struct VirtIOSerialPCI VirtIOSerialPCI;

typedef struct VirtIONetPCI VirtIONetPCI;

typedef struct VHostSCSIPCI VHostSCSIPCI;

typedef struct VHostUserSCSIPCI VHostUserSCSIPCI;

typedef struct VirtIOGPUPCI VirtIOGPUPCI;

typedef struct VirtIOCryptoPCI VirtIOCryptoPCI;
@@ -220,15 +218,6 @@ struct VHostSCSIPCI { 
};

#endif



#define TYPE_VHOST_USER_SCSI_PCI "vhost-user-scsi-pci-base"

#define VHOST_USER_SCSI_PCI(obj) \

        OBJECT_CHECK(VHostUserSCSIPCI, (obj), TYPE_VHOST_USER_SCSI_PCI)



struct VHostUserSCSIPCI {

    VirtIOPCIProxy parent_obj;

    VHostUserSCSI vdev;

};



/*

 * virtio-blk-pci: This extends VirtioPCIProxy.

 */