aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2010-03-31 11:52:44 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2010-04-01 13:56:19 -0500
commit087431d1d1bf4e785edfa89e8cd05fcdac558dc3 (patch)
treeefa418ad4bf585c7b345a91b6a0acfc3a0c3e55d
parentb33612d03540fda7fa67485f1c20395beb7a2bf0 (diff)
downloadqemu-087431d1d1bf4e785edfa89e8cd05fcdac558dc3.zip
qemu-087431d1d1bf4e785edfa89e8cd05fcdac558dc3.tar.gz
qemu-087431d1d1bf4e785edfa89e8cd05fcdac558dc3.tar.bz2
virtio-pci: compile per-target
With vhost, virtio-pci needs to include kvm.h and kvm.h needs to be built per-target. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--Makefile.objs1
-rw-r--r--Makefile.target2
2 files changed, 1 insertions, 2 deletions
diff --git a/Makefile.objs b/Makefile.objs
index ef3adac..74d7a3d 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -130,7 +130,6 @@ user-obj-y += cutils.o cache-utils.o
hw-obj-y =
hw-obj-y += loader.o
hw-obj-y += virtio.o virtio-console.o
-hw-obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o
hw-obj-y += fw_cfg.o pci.o pci_host.o pcie_host.o
hw-obj-y += watchdog.o
hw-obj-$(CONFIG_ISA_MMIO) += isa_mmio.o
diff --git a/Makefile.target b/Makefile.target
index 2157554..f115df6 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -164,7 +164,7 @@ 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-serial-bus.o
+obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-pci.o virtio-serial-bus.o
obj-y += rwhandler.o
obj-$(CONFIG_KVM) += kvm.o kvm-all.o
LIBS+=-lz