Re: [Qemu-devel] [PATCH v2 10/22] virtio: split vsock bits from virtio-pci

[Dr. David Alan Gilbert]

* Thomas Huth (address@hidden) wrote:
> On 08/08/2018 01:48 PM, Juan Quintela wrote:
> > Signed-off-by: Juan Quintela <address@hidden>
> > ---
> >  hw/virtio/Makefile.objs     |  2 +-
> >  hw/virtio/vhost-vsock-pci.c | 71 +++++++++++++++++++++++++++++++++++++
> >  hw/virtio/virtio-pci.c      | 51 --------------------------
> >  3 files changed, 72 insertions(+), 52 deletions(-)
> >  create mode 100644 hw/virtio/vhost-vsock-pci.c
> > 
> > diff --git a/hw/virtio/Makefile.objs b/hw/virtio/Makefile.objs
> > index 1b2799cfd8..4fbf7de84b 100644
> > --- a/hw/virtio/Makefile.objs
> > +++ b/hw/virtio/Makefile.objs
> > @@ -10,7 +10,7 @@ obj-$(CONFIG_VIRTIO_CRYPTO) += virtio-crypto.o
> >  obj-$(call land,$(CONFIG_VIRTIO_CRYPTO),$(CONFIG_VIRTIO_PCI)) += 
> > virtio-crypto-pci.o
> >  
> >  obj-$(CONFIG_LINUX) += vhost.o vhost-backend.o vhost-user.o
> > -obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock.o
> > +obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock.o vhost-vsock-pci.o
> >  endif
> >  
> >  common-obj-$(call lnot,$(call land,$(CONFIG_VIRTIO),$(CONFIG_LINUX))) += 
> > vhost-stub.o
> > diff --git a/hw/virtio/vhost-vsock-pci.c b/hw/virtio/vhost-vsock-pci.c
> > new file mode 100644
> > index 0000000000..5805667dc0
> > --- /dev/null
> > +++ b/hw/virtio/vhost-vsock-pci.c
> > @@ -0,0 +1,71 @@
> > +/*
> > + * Virtio vsock PCI vhost Bindings
> > + *
> > + * Copyright IBM, Corp. 2007
> > + * Copyright (c) 2009 CodeSourcery
> > + *
> > + * Authors:
> > + *  Anthony Liguori   <address@hidden>
> > + *  Paul Brook        <address@hidden>
> 
> The vhost-vsock code has been added by Stefan in 2016, so these
> Copyright and Author informations looks somehow weird in this new file
> now. Not sure how to deal best with this situation, ... I'd maybe simply
> drop the above lines in the new file?

Well, we should figure it out; if it's all new code then it doesn't need
to be GPL 2 only either.

Dave

>  Thomas
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK