From mboxrd@z Thu Jan 1 00:00:00 1970 From: klondike Subject: [PATCH] Fix build system so pci.o isn't included on targets not depending on PCI Date: Wed, 23 Feb 2011 08:06:24 +0100 Message-ID: <4D64B1F0.50306@gmail.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig0FAB624C6939E77A8F9C875B" To: kvm@vger.kernel.org Return-path: Received: from mail-bw0-f51.google.com ([209.85.214.51]:62680 "EHLO mail-bw0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751541Ab1BWHGR (ORCPT ); Wed, 23 Feb 2011 02:06:17 -0500 Received: by bwz10 with SMTP id 10so4185652bwz.10 for ; Tue, 22 Feb 2011 23:06:16 -0800 (PST) Sender: kvm-owner@vger.kernel.org List-ID: This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig0FAB624C6939E77A8F9C875B Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable 2010-11-10 Francisco Blas Izquierdo Riera 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 +=3D loader.o hw-obj-$(CONFIG_VIRTIO) +=3D virtio.o virtio-console.o hw-obj-y +=3D fw_cfg.o -hw-obj-$(CONFIG_PCI) +=3D pci_bridge.o +hw-obj-$(CONFIG_PCI) +=3D pci.o pci_bridge.o hw-obj-$(CONFIG_PCI) +=3D msix.o msi.o hw-obj-$(CONFIG_PCI) +=3D pci_host.o pcie_host.o hw-obj-$(CONFIG_PCI) +=3D ioh3420.o xio3130_upstream.o xio3130_downstrea= m.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 =20 -obj-y =3D arch_init.o cpus.o monitor.o pci.o machine.o gdbstub.o vl.o balloon.o +obj-y =3D 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-n= et. # need to fix this properly obj-$(CONFIG_NO_PCI) +=3D pci-stub.o --------------enig0FAB624C6939E77A8F9C875B Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk1ksfAACgkQcfrM1mX4BmD/RwCff5uQjyYOgIS/IlCixy1to1iV OxYAoKZ9GMjg5Eh2IJ1B8oLtaHWphtLZ =89ef -----END PGP SIGNATURE----- --------------enig0FAB624C6939E77A8F9C875B--