[PATCH] Fix build system so pci.o isn't included on targets not depending on PCI

[PATCH] Fix build system so pci.o isn't included on targets not depending on PCI

[klondike]

[-- Attachment #1: Type: text/plain, Size: 1723 bytes --]

2010-11-10    Francisco Blas Izquierdo Riera <klondike@xiscosoft.es>
        Somehow pci.o was added so it was needed on all targets breaking
NO_PCI ones. This patch intends to fix that
        This error appeared during a merge with the main tree so it may
have been caused by some oddity in that process.

        * Makefile.objs:         Add pci.o back into hw-obj-$(CONFIG_PCI)
        * Makefile.target:        Remove pci.o

diff -ru /tmp/aaa/qemu-kvm-0.14.0.old/Makefile.objs
/tmp/aaa/qemu-kvm-0.14.0/Makefile.objs
--- /tmp/aaa/qemu-kvm-0.14.0.old/Makefile.objs    2011-02-23
06:02:16.818182597 +0100
+++ /tmp/aaa/qemu-kvm-0.14.0/Makefile.objs    2011-02-23
06:00:35.439182597 +0100
@@ -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_bridge.o
+hw-obj-$(CONFIG_PCI) += pci.o 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 -ru /tmp/aaa/qemu-kvm-0.14.0.old/Makefile.target
/tmp/aaa/qemu-kvm-0.14.0/Makefile.target
--- /tmp/aaa/qemu-kvm-0.14.0.old/Makefile.target    2011-02-23
06:02:16.835182597 +0100
+++ /tmp/aaa/qemu-kvm-0.14.0/Makefile.target    2011-02-23
06:00:35.454182597 +0100
@@ -195,7 +195,7 @@
 # System emulator target
 ifdef CONFIG_SOFTMMU
 
-obj-y = arch_init.o cpus.o monitor.o pci.o machine.o gdbstub.o vl.o
balloon.o
+obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o vl.o balloon.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


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 262 bytes --]