On 2018-11-26 20:59, Juan Quintela wrote: > Signed-off-by: Juan Quintela <quint...@redhat.com> > > --- > > Updated copyright info > Also split virtio-pci.h bits > --- > hw/virtio/Makefile.objs | 2 +- > hw/virtio/vhost-vsock-pci.c | 82 +++++++++++++++++++++++++++++++++++++ > hw/virtio/virtio-pci.c | 51 ----------------------- > hw/virtio/virtio-pci.h | 18 -------- > 4 files changed, 83 insertions(+), 70 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
Please change this into: obj-$(call land,$(CONFIG_VHOST_VSOCK),$(CONFIG_VIRTIO_PCI)) += vhost-vsock-pci.o Rationale: There could be targets that don't use virtio-pci (but virtio-mmio or virtio-ccw), and without this, the PCI devices are suddenly included while they were not included before. Same change in the other patches of this series, too, please. Thomas
