Blame 0001-buildsys-Move-msi-x-and-virtio-pci-from-Makefile.obj.patch

4a5845
>From 309ac5b2ef96678f30c67b71e342813688040e72 Mon Sep 17 00:00:00 2001
4a5845
From: Hans de Goede <hdegoede@redhat.com>
4a5845
Date: Wed, 4 Jul 2012 17:19:20 +0200
4a5845
Subject: [PATCH 01/15] buildsys: Move msi[x] and virtio-pci from
4a5845
 Makefile.objs to Makefile.target
4a5845
4a5845
Building both kvm and non kvm versions of qemu in the same tree,
4a5845
results in a link error during the non kvm build with undefined references
4a5845
to kvm_kernel_irqchip, expanded from the kvm_irqchip_in_kernel macro.
4a5845
4a5845
This patch fixes this.
4a5845
4a5845
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
4a5845
---
4a5845
 Makefile.objs   |    2 --
4a5845
 Makefile.target |    3 ++-
4a5845
 2 files changed, 2 insertions(+), 3 deletions(-)
4a5845
4a5845
diff --git a/Makefile.objs b/Makefile.objs
4a5845
index 264f1fe..8d49738 100644
4a5845
--- a/Makefile.objs
4a5845
+++ b/Makefile.objs
4a5845
@@ -211,10 +211,8 @@ hw-obj-y =
4a5845
 hw-obj-y += vl.o loader.o
4a5845
 hw-obj-$(CONFIG_VIRTIO) += virtio-console.o
4a5845
 hw-obj-y += usb/libhw.o
4a5845
-hw-obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o
4a5845
 hw-obj-y += fw_cfg.o
4a5845
 hw-obj-$(CONFIG_PCI) += pci_bridge.o pci_bridge_dev.o
4a5845
-hw-obj-$(CONFIG_PCI) += msix.o msi.o
4a5845
 hw-obj-$(CONFIG_PCI) += shpc.o
4a5845
 hw-obj-$(CONFIG_PCI) += slotid_cap.o
4a5845
 hw-obj-$(CONFIG_PCI) += pci_host.o pcie_host.o
4a5845
diff --git a/Makefile.target b/Makefile.target
4a5845
index eda8637..ede8ed3 100644
4a5845
--- a/Makefile.target
4a5845
+++ b/Makefile.target
4a5845
@@ -183,9 +183,10 @@ obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o balloon.o ioport.o
4a5845
 # virtio has to be here due to weird dependency between PCI and virtio-net.
4a5845
 # need to fix this properly
4a5845
 obj-$(CONFIG_NO_PCI) += pci-stub.o
4a5845
-obj-$(CONFIG_PCI) += pci.o
4a5845
+obj-$(CONFIG_PCI) += pci.o msi.o msix.o
4a5845
 obj-$(CONFIG_VIRTIO) += virtio.o virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial-bus.o
4a5845
 obj-$(CONFIG_VIRTIO) += virtio-scsi.o
4a5845
+obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o
4a5845
 obj-y += vhost_net.o
4a5845
 obj-$(CONFIG_VHOST_NET) += vhost.o
4a5845
 obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/virtio-9p-device.o
4a5845
-- 
4a5845
1.7.10.4
4a5845
4a5845