On Fri, Dec 14, 2018 at 10:19:38AM +0100, Thomas Huth 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-scsi-pci.c | 95 ++++++++++++++++++++++++++++++++++++++ > > hw/virtio/virtio-pci.c | 59 ----------------------- > > hw/virtio/virtio-pci.h | 19 -------- > > 4 files changed, 96 insertions(+), 78 deletions(-) > > create mode 100644 hw/virtio/vhost-scsi-pci.c > > > > diff --git a/hw/virtio/Makefile.objs b/hw/virtio/Makefile.objs > > index f851a6f2b5..0a56946c1a 100644 > > --- a/hw/virtio/Makefile.objs > > +++ b/hw/virtio/Makefile.objs > > @@ -15,6 +15,7 @@ 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_VHOST_SCSI) += vhost-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-scsi-pci.c b/hw/virtio/vhost-scsi-pci.c > > new file mode 100644 > > index 0000000000..2be2c567ea > > --- /dev/null > > +++ b/hw/virtio/vhost-scsi-pci.c > > @@ -0,0 +1,95 @@ > > +/* > > + * Vhost scsi PCI bindings > > + * > > + * Copyright IBM, Corp. 2011 > > + * > > + * Authors: > > + * Stefan Hajnoczi <stefa...@linux.vnet.ibm.com> > > + * > > + * Changes for QEMU mainline + tcm_vhost kernel upstream: > > + * 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. > > Let's double-check: Stefan, Nicholas, should this file be LGPLv2.1+ > (like hw/scsi/vhost-scsi.c) or rather GPLv2+ (like hw/virtio/virtio-pci.c) ?
I had the LGPL in mind. Stefan
signature.asc
Description: PGP signature
