From patchwork Mon Mar 2 10:08:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 445013 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 6D6D9140172 for ; Mon, 2 Mar 2015 21:10:28 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=xfxllz5P; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: from localhost ([::1]:55938 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YSNIw-0003K9-AF for incoming@patchwork.ozlabs.org; Mon, 02 Mar 2015 05:10:26 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33179) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YSNHn-0001iL-Si for qemu-devel@nongnu.org; Mon, 02 Mar 2015 05:09:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YSNHk-0007lf-6T for qemu-devel@nongnu.org; Mon, 02 Mar 2015 05:09:15 -0500 Received: from mail-wg0-x22c.google.com ([2a00:1450:400c:c00::22c]:44838) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YSNHj-0007l5-Vg for qemu-devel@nongnu.org; Mon, 02 Mar 2015 05:09:12 -0500 Received: by wggx12 with SMTP id x12so32302544wgg.11 for ; Mon, 02 Mar 2015 02:09:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=u1UiY3MkKWAEe3oZFU1H2tMCU3dUnvFRUYyAjiiv+KM=; b=xfxllz5PWZKGqEK4RwFLU4MBCI7bCTysI7ycBHv3n3N6jUHzD6RAVzMcih6/+qg4Oq nM3BU2ss0QtKbJ80Y0F3ExYSZO/MSKG6TdCPq412OgbSxlk58O2gKft5zezno71FeU/l nE8m9LTVIlr8Bu3I0bXh0lvhn0o4U1ROBJa3fTM/WCRKu/rbijfgGkes/q4Odo6MC3uI v0dd3TRFKRwpRd/sIAdtAbtYnUPUBRdOwP9u7n7VZ9VVKh2cihWg0Np5mjcVCtVw/+O9 pQzD7n+jzB1IOi2TgEKz06YbP5kwIldYvd1IA+WAGlifrWBU/3iffk9f6/FXUSbM/bZx otaQ== X-Received: by 10.194.120.40 with SMTP id kz8mr57710485wjb.21.1425290950863; Mon, 02 Mar 2015 02:09:10 -0800 (PST) Received: from localhost.localdomain (net-37-116-207-136.cust.vodafonedsl.it. [37.116.207.136]) by mx.google.com with ESMTPSA id g10sm15364685wic.7.2015.03.02.02.09.09 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Mar 2015 02:09:09 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 2 Mar 2015 11:08:45 +0100 Message-Id: <1425290934-60872-7-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 2.3.0 In-Reply-To: <1425290934-60872-1-git-send-email-pbonzini@redhat.com> References: <1425290934-60872-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c00::22c Cc: David Gibson Subject: [Qemu-devel] [PULL 06/15] Add specific config options for PCI-E bridges X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: David Gibson The i82801b11, ioh3420 and xio3130 PCI Express devices are currently included in the build unconditionally. While they could theoretically appear on any target platform with PCI-E, they're pretty unlikely to appear on platforms that aren't Intel derived. Therefore, to avoid presenting unlikely-to-be-relevant devices to the user, add config options to enable these components, and enable them by default only on x86 and arm platforms. (Note that this patch does include these for aarch64, via its inclusion of arm-softmmu.mak). Signed-off-by: David Gibson Reviewed-by: Peter Crosthwaite Message-Id: <1425017077-18487-2-git-send-email-david@gibson.dropbear.id.au> Signed-off-by: Paolo Bonzini --- default-configs/arm-softmmu.mak | 4 ++++ default-configs/i386-softmmu.mak | 3 +++ default-configs/x86_64-softmmu.mak | 3 +++ hw/pci-bridge/Makefile.objs | 5 +++-- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index b00c2e1..6ee9b43 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -91,3 +91,7 @@ CONFIG_INTEGRATOR_DEBUG=y CONFIG_ALLWINNER_A10_PIT=y CONFIG_ALLWINNER_A10_PIC=y CONFIG_ALLWINNER_A10=y + +CONFIG_XIO3130=y +CONFIG_IOH3420=y +CONFIG_I82801B11=y diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index bd99af9..0b8ce4b 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -43,3 +43,6 @@ CONFIG_IOAPIC=y CONFIG_ICC_BUS=y CONFIG_PVPANIC=y CONFIG_MEM_HOTPLUG=y +CONFIG_XIO3130=y +CONFIG_IOH3420=y +CONFIG_I82801B11=y diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak index e7c2734..6add04a 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -43,3 +43,6 @@ CONFIG_IOAPIC=y CONFIG_ICC_BUS=y CONFIG_PVPANIC=y CONFIG_MEM_HOTPLUG=y +CONFIG_XIO3130=y +CONFIG_IOH3420=y +CONFIG_I82801B11=y diff --git a/hw/pci-bridge/Makefile.objs b/hw/pci-bridge/Makefile.objs index 968b369..96c596e 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-$(CONFIG_XIO3130) += 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