From e9d0fc74636cd713414c17139659ad2f69a46da0 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Tue, 6 Apr 2010 12:11:43 +0200 Subject: [PATCH] Make virtio-pci building conditional again Commit b305b9d7d6990e492966ffb1fdf619482adeb7e2 made building of virtio-pci conditional and not enabled on S390x, because it collides with the S390 bus. Commit 087431d1d1bf4e785edfa89e8cd05fcdac558dc3 accidentially reverted that behavior, breaking S390x again. So here's a follow-up patch disabling building of virtio-pci on S390x again. This unbreaks the S390x target. Signed-off-by: Alexander Graf Signed-off-by: Aurelien Jarno --- Makefile.target | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.target b/Makefile.target index 45cbe56bde..2624b1d218 100644 --- a/Makefile.target +++ b/Makefile.target @@ -164,7 +164,8 @@ ifdef CONFIG_SOFTMMU obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o vl.o # virtio has to be here due to weird dependency between PCI and virtio-net. # need to fix this properly -obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-pci.o virtio-serial-bus.o +obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial-bus.o +obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o obj-y += event_notifier.o obj-y += vhost_net.o obj-$(CONFIG_VHOST_NET) += vhost.o