> On Dec 14, 2018, at 9:14 AM, Thomas Huth <th...@redhat.com> wrote: > > On 2018-12-13 22:00, Juan Quintela wrote: >> Reviewed-by: Laurent Vivier <lviv...@redhat.com> >> Signed-off-by: Juan Quintela <quint...@redhat.com> >> --- >> hw/virtio/Makefile.objs | 1 + >> hw/virtio/vhost-user-scsi-pci.c | 101 ++++++++++++++++++++++++++++++++ >> hw/virtio/virtio-pci.c | 58 ------------------ >> hw/virtio/virtio-pci.h | 11 ---- >> 4 files changed, 102 insertions(+), 69 deletions(-) >> create mode 100644 hw/virtio/vhost-user-scsi-pci.c >> >> diff --git a/hw/virtio/Makefile.objs b/hw/virtio/Makefile.objs >> index 35b7698446..f851a6f2b5 100644 >> --- a/hw/virtio/Makefile.objs >> +++ b/hw/virtio/Makefile.objs >> @@ -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 >> diff --git a/hw/virtio/vhost-user-scsi-pci.c >> b/hw/virtio/vhost-user-scsi-pci.c >> new file mode 100644 >> index 0000000000..5baec9c356 >> --- /dev/null >> +++ b/hw/virtio/vhost-user-scsi-pci.c >> @@ -0,0 +1,101 @@ >> +/* >> + * Vhost user scsi PCI Bindings >> + * >> + * Copyright (c) 2016 Nutanix Inc. All rights reserved. >> + * >> + * Author: >> + * Felipe Franciosi <fel...@nutanix.com> >> + * >> + * This work is largely based on the "vhost-scsi" implementation by: >> + * Stefan Hajnoczi <stefa...@linux.vnet.ibm.com> >> + * Nicholas Bellinger <n...@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. > > Not sure whether this should be LGPL (since hw/scsi/vhost-user-scsi.c is > LGPL, too) or GPLv2+ (since the original code in the file > hw/virtio/virtio-pci.c is GPLv2+) ... Felipe, any preferences? I have absolutely no preferences and am perfectly happy with however it is decided to take this forward. Cheers, Felipe > > NB: "LGPL, version 2" is also inaccurate. According to our COPYING.LIB > file which is referenced in the comment, we are using version 2.1 ... > >> + */ >> + >> +#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" >> +#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 TypeInfo vhost_user_scsi_pci_info = { >> + .name = TYPE_VHOST_USER_SCSI_PCI, >> + .parent = TYPE_VIRTIO_PCI, >> + .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) >> +{ >> + type_register_static(&vhost_user_scsi_pci_info); >> +} >> + >> +type_init(vhost_user_scsi_pci_register) >> diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c >> index e9c562b1c0..7c99d9385a 100644 >> --- a/hw/virtio/virtio-pci.c >> +++ b/hw/virtio/virtio-pci.c >> @@ -2075,61 +2075,6 @@ static const TypeInfo 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 TypeInfo vhost_user_scsi_pci_info = { >> - .name = TYPE_VHOST_USER_SCSI_PCI, >> - .parent = TYPE_VIRTIO_PCI, >> - .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) >> @@ -2314,9 +2259,6 @@ static void virtio_pci_register_types(void) >> #ifdef CONFIG_VHOST_SCSI >> type_register_static(&vhost_scsi_pci_info); >> #endif >> -#if defined(CONFIG_VHOST_USER) && defined(CONFIG_LINUX) >> - type_register_static(&vhost_user_scsi_pci_info); >> -#endif >> } >> >> type_init(virtio_pci_register_types)