From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41154) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YNwk2-00015r-Gf for qemu-devel@nongnu.org; Wed, 18 Feb 2015 00:00:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YNwk1-0000Wm-4g for qemu-devel@nongnu.org; Wed, 18 Feb 2015 00:00:06 -0500 Received: from ozlabs.org ([2401:3900:2:1::2]:43732) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YNwk0-0000Qx-QK for qemu-devel@nongnu.org; Wed, 18 Feb 2015 00:00:05 -0500 From: David Gibson Date: Wed, 18 Feb 2015 15:59:56 +1100 Message-Id: <1424235596-29024-1-git-send-email-david@gibson.dropbear.id.au> Subject: [Qemu-devel] [PATCH] Make i82801b11 and ioh3420 x86 only by default List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: mst@redhat.com, yamahata@valinux.co.jp Cc: pbonzini@redhat.com, qemu-devel@nongnu.org, David Gibson As PCI devices, the i82801b11 and ioh3420 devices could theoretically exist on any platform with a PCI bus. However in practice, they're Intel specific devices, that are very unlikely to appear on anything other than an x86. Therefore this patch gives them their own config options, enabled only for x86 targets by default. Signed-off-by: David Gibson --- default-configs/i386-softmmu.mak | 2 ++ hw/pci-bridge/Makefile.objs | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index bd99af9..609c73a 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -43,3 +43,5 @@ CONFIG_IOAPIC=y CONFIG_ICC_BUS=y CONFIG_PVPANIC=y CONFIG_MEM_HOTPLUG=y +CONFIG_IOH3420=y +CONFIG_I82801B11=y diff --git a/hw/pci-bridge/Makefile.objs b/hw/pci-bridge/Makefile.objs index 968b369..2715721 100644 --- a/hw/pci-bridge/Makefile.objs +++ b/hw/pci-bridge/Makefile.objs @@ -1,5 +1,6 @@ common-obj-y += pci_bridge_dev.o -common-obj-y += ioh3420.o xio3130_upstream.o xio3130_downstream.o -common-obj-y += i82801b11.o +common-obj-y += xio3130_upstream.o xio3130_downstream.o +common-obj-$(CONFIG_IOH3420) += ioh3420.o +common-obj-$(CONFIG_I82801B11) += i82801b11.o # NewWorld PowerMac common-obj-$(CONFIG_DEC_PCI) += dec.o -- 2.1.0