On 22.05.2018 21:50, Paolo Bonzini wrote: > This is only half of the work, because the proxy devices (virtio-*-pci, > virtio-*-ccw, etc.) are still included unconditionally. It is still a > move in the right direction. [...] > diff --git a/hw/virtio/Makefile.objs b/hw/virtio/Makefile.objs > index 765d363c1f..1b2799cfd8 100644 > --- a/hw/virtio/Makefile.objs > +++ b/hw/virtio/Makefile.objs > @@ -1,15 +1,17 @@ > ifeq ($(CONFIG_VIRTIO),y) > -common-obj-y += virtio-rng.o > -common-obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o > common-obj-y += virtio-bus.o > -common-obj-y += virtio-mmio.o > +obj-y += virtio.o
While you're at it, I think you could also remove the ifeq at the beginning of this file, and change the virtio-bus.o and virtio.o lines to use $(CONFIG_VIRTIO) instead of "y". But it's just a matter of taste, so either way: Reviewed-by: Thomas Huth <th...@redhat.com>