qemu-kvm: Don't break device assignment INTx
Commit 1a836445 moved pci.o from a target object to a generic hardware
object, which drops CONFIG_KVM_DEVICE_ASSIGNMENT. This results in
the device assignment kludge to update INTx vectors on interrupt
routing changes never getting called, which means device assignment
level triggered interrupts don't work. This mostly reverts that
commit, but makes pci.o conditional on CONFIG_PCI, which hopefully
addresses the original intent of the change. Fixes:
https://bugs.launchpad.net/qemu/+bug/730441
Reported-by: Yongjie Ren <yongjie.ren@intel.com>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
(cherry picked from commit 2124d7b42c2f0d88460d12fd33123fe67cad286f)
diff --git a/Makefile.objs b/Makefile.objs
index 37dea57..a647c45 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -170,7 +170,7 @@
hw-obj-y += loader.o
hw-obj-$(CONFIG_VIRTIO) += virtio.o virtio-console.o
hw-obj-y += fw_cfg.o
-hw-obj-$(CONFIG_PCI) += pci.o pci_bridge.o
+hw-obj-$(CONFIG_PCI) += pci_bridge.o
hw-obj-$(CONFIG_PCI) += msix.o msi.o
hw-obj-$(CONFIG_PCI) += pci_host.o pcie_host.o
hw-obj-$(CONFIG_PCI) += ioh3420.o xio3130_upstream.o xio3130_downstream.o
diff --git a/Makefile.target b/Makefile.target
index e3caa53..e3d4951 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -199,6 +199,7 @@
# 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_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
