diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-01-10 10:32:01 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-01-10 10:32:01 -0600 |
| commit | 23ce4cbcc9d8f194354de2ce3b29b6817abdb986 (patch) | |
| tree | ea7baf4b742064e092985f5c15d6579fbc6db20f /Makefile.target | |
| parent | 3b0152ae7d2b601735ad2aa7e35f972428927d24 (diff) | |
| parent | 3622f736cdfa824d68ac8b0a0f1a3725149eb1df (diff) | |
| download | qemu-23ce4cbcc9d8f194354de2ce3b29b6817abdb986.tar.gz qemu-23ce4cbcc9d8f194354de2ce3b29b6817abdb986.tar.bz2 qemu-23ce4cbcc9d8f194354de2ce3b29b6817abdb986.zip | |
Merge remote branch 'mst/for_anthony' into staging
Diffstat (limited to 'Makefile.target')
| -rw-r--r-- | Makefile.target | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.target b/Makefile.target index a5e217edc3..e15b1c4fb6 100644 --- a/Makefile.target +++ b/Makefile.target @@ -1,6 +1,7 @@ # -*- Mode: makefile -*- GENERATED_HEADERS = config-target.h +CONFIG_NO_PCI = $(if $(subst n,,$(CONFIG_PCI)),n,y) CONFIG_NO_KVM = $(if $(subst n,,$(CONFIG_KVM)),n,y) include ../config-host.mak @@ -188,6 +189,7 @@ ifdef CONFIG_SOFTMMU obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o balloon.o # virtio has to be here due to weird dependency between PCI and virtio-net. # need to fix this properly +obj-$(CONFIG_NO_PCI) += pci-stub.o obj-$(CONFIG_VIRTIO) += virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial-bus.o obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o obj-y += vhost_net.o |