buildsys: Move msi[x] and virtio-pci from Makefile.objs to Makefile.target

Commit Message

Hans de Goede July 5, 2012, 1:35 p.m. UTC

Building non-kvm versions of qemu from qemu-kvm.git results in a linker error
with undefined references to kvm_kernel_irqchip, expanded from the
kvm_irqchip_in_kernel macro in kvm.h:

This patch fixes this.

Note maybe a better fix would be to drop the test for !defined NEED_CPU_H
in the above macro ?

Signed-off-by: Hans de Goede <[e-mail]>
---
 Makefile.objs   |    2 --
 Makefile.target |    3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

Comments

Jan Kiszka July 5, 2012, 2:50 p.m. UTC | #1

On 2012-07-05 15:35, Hans de Goede wrote:
> Building non-kvm versions of qemu from qemu-kvm.git results in a linker error
> with undefined references to kvm_kernel_irqchip, expanded from the
> kvm_irqchip_in_kernel macro in kvm.h:
> 
> This patch fixes this.
> 
> Note maybe a better fix would be to drop the test for !defined NEED_CPU_H
> in the above macro ?

The best solution is to push device assignment upstream and celebrate
the funeral of qemu-kvm. ;)

Until then, qemu-kvm-1.1 (not master) just has to pick "kvm: Enable use
of kvm_irqchip_in_kernel in hwlib code" (bbf3b80401) from upstream.

Jan

Patch

diff --git a/Makefile.objs b/Makefile.objs
index 264f1fe..8d49738 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -211,10 +211,8 @@  hw-obj-y =
 hw-obj-y += vl.o loader.o
 hw-obj-$(CONFIG_VIRTIO) += virtio-console.o
 hw-obj-y += usb/libhw.o
-hw-obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o
 hw-obj-y += fw_cfg.o
 hw-obj-$(CONFIG_PCI) += pci_bridge.o pci_bridge_dev.o
-hw-obj-$(CONFIG_PCI) += msix.o msi.o
 hw-obj-$(CONFIG_PCI) += shpc.o
 hw-obj-$(CONFIG_PCI) += slotid_cap.o
 hw-obj-$(CONFIG_PCI) += pci_host.o pcie_host.o
diff --git a/Makefile.target b/Makefile.target
index eda8637..ede8ed3 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -183,9 +183,10 @@  obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o balloon.o ioport.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_PCI) += pci.o
+obj-$(CONFIG_PCI) += pci.o msi.o msix.o
 obj-$(CONFIG_VIRTIO) += virtio.o virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial-bus.o
 obj-$(CONFIG_VIRTIO) += virtio-scsi.o
+obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o
 obj-y += vhost_net.o
 obj-$(CONFIG_VHOST_NET) += vhost.o
 obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/virtio-9p-device.o