From patchwork Thu Nov 9 12:58:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 836339 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) 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 3yXjsr53ydz9s4s for ; Thu, 9 Nov 2017 23:59:12 +1100 (AEDT) Received: from localhost ([::1]:36560 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCmQI-0001wF-QZ for incoming@patchwork.ozlabs.org; Thu, 09 Nov 2017 07:59:10 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33218) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCmPl-0001uj-Rc for qemu-devel@nongnu.org; Thu, 09 Nov 2017 07:58:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCmPi-0007fu-2s for qemu-devel@nongnu.org; Thu, 09 Nov 2017 07:58:37 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56152) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eCmPh-0007fW-TI for qemu-devel@nongnu.org; Thu, 09 Nov 2017 07:58:34 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0B162883CE; Thu, 9 Nov 2017 12:58:33 +0000 (UTC) Received: from localhost.localdomain (unknown [10.35.206.38]) by smtp.corp.redhat.com (Postfix) with ESMTP id D1B7860C9C; Thu, 9 Nov 2017 12:58:26 +0000 (UTC) From: Marcel Apfelbaum To: qemu-devel@nongnu.org Date: Thu, 9 Nov 2017 14:58:26 +0200 Message-Id: <20171109125826.120228-1-marcel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 09 Nov 2017 12:58:33 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH V4] hw/pcie-pci-bridge: restrict to X86 and ARM X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: marcel@redhat.com, thuth@redhat.com, cohuck@redhat.com, zuban32s@gmail.com, mst@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The PCIE-PCI bridge is specific to "pure" PCIe systems (on QEMU we have X86 and ARM), it does not make sense to have it in other archs. Reported-by: Thomas Huth Signed-off-by: Marcel Apfelbaum --- V3 -> V4: - Move the config line to pci.mak (Thomas) V2 -> V3: - Another tweak in subject s/if/it (Cornelia) V1 -> V2: Addressed Thomas and Cornelia comments: - Conditioned the pcie-pci-bridge compilation on the PCIe Root CONFIG_PCIE_PORT - Tweaked subject PCI -> PCIe Thanks, Marcel default-configs/pci.mak | 1 + hw/pci-bridge/Makefile.objs | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/default-configs/pci.mak b/default-configs/pci.mak index e514bdef42..7724b9657a 100644 --- a/default-configs/pci.mak +++ b/default-configs/pci.mak @@ -43,3 +43,4 @@ CONFIG_VGA_PCI=y CONFIG_IVSHMEM_DEVICE=$(CONFIG_IVSHMEM) CONFIG_ROCKER=y CONFIG_VHOST_USER_SCSI=$(call land,$(CONFIG_VHOST_USER),$(CONFIG_LINUX)) +CONFIG_PCIE_PCI_BRIDGE=$(CONFIG_PCIE_PORT) diff --git a/hw/pci-bridge/Makefile.objs b/hw/pci-bridge/Makefile.objs index 666db37da2..9d23a7038a 100644 --- a/hw/pci-bridge/Makefile.objs +++ b/hw/pci-bridge/Makefile.objs @@ -1,6 +1,7 @@ -common-obj-y += pci_bridge_dev.o pcie_pci_bridge.o +common-obj-y += pci_bridge_dev.o common-obj-$(CONFIG_PCIE_PORT) += pcie_root_port.o gen_pcie_root_port.o common-obj-$(CONFIG_PXB) += pci_expander_bridge.o +common-obj-$(CONFIG_PCIE_PCI_BRIDGE) += pcie_pci_bridge.o common-obj-$(CONFIG_XIO3130) += xio3130_upstream.o xio3130_downstream.o common-obj-$(CONFIG_IOH3420) += ioh3420.o common-obj-$(CONFIG_I82801B11) += i82801b11.o