From 087431d1d1bf4e785edfa89e8cd05fcdac558dc3 Mon Sep 17 00:00:00 2001 From: Anthony Liguori Date: Wed, 31 Mar 2010 11:52:44 -0500 Subject: [PATCH] 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 --- Makefile.objs | 1 - Makefile.target | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index ef3adac6c0..74d7a3d8f6 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 21575542b7..f115df685c 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 -- 2.11.4.GIT