From nobody Mon Feb 9 22:38:26 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1486345288415996.1077706692437; Sun, 5 Feb 2017 17:41:28 -0800 (PST) Received: from localhost ([::1]:45152 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1caYJ4-0005Xp-Mc for importer@patchew.org; Sun, 05 Feb 2017 20:41:26 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35293) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1caYHJ-0004cY-HM for qemu-devel@nongnu.org; Sun, 05 Feb 2017 20:39:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1caYHI-00008U-FK for qemu-devel@nongnu.org; Sun, 05 Feb 2017 20:39:37 -0500 Received: from ozlabs.org ([2401:3900:2:1::2]:45887) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1caYHI-00007u-2i; Sun, 05 Feb 2017 20:39:36 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 3vGqs00qfKz9s7F; Mon, 6 Feb 2017 12:39:31 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1486345172; bh=DWJlLqcCPGnbqY8oVi8UgVQz8NJ04AlyAqgfJBUYrpU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DpOsvpIL2apC+t00R6TF6LNTCHcYFWcBlVajBar4ipPTnDYt8R3vIhAfNFMT8HikF n5IS6PCBhq4JyFPtAMP4N0pzKZH7qm/Rpc+5izdncZJNPcdyNjw8ITs15Zm4xM5m92 +DKO1RVa9eedcwzUEsXusZ9qbHWzQa2XMlqMdq3U= From: David Gibson To: peter.maydell@linaro.org Date: Mon, 6 Feb 2017 12:39:26 +1100 Message-Id: <20170206013927.13693-3-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170206013927.13693-1-david@gibson.dropbear.id.au> References: <20170206013927.13693-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PULL 2/3] Allow ISA bus to be configured out 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: veroniabahaa@gmail.com, agraf@suse.de, proljc@gmail.com, jcmvbkbc@gmail.com, kbastian@mail.uni-paderborn.de, mst@redhat.com, qemu-devel@nongnu.org, armbru@redhat.com, borntraeger@de.ibm.com, michael@walle.cc, qemu-ppc@nongnu.org, pbonzini@redhat.com, cornelia.huck@de.ibm.com, edgar.iglesias@gmail.com, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Currently, the code to handle the legacy ISA bus is always included in qemu. However there are lots of platforms that don't include ISA legacy devies, and quite a few that have never used ISA legacy devices at all. This patch allows the ISA bus code to be disabled in the configuration for platforms where it doesn't make sense. For now, the default configs are adjusted to include ISA on all platforms including PCI: anything with PCI can at least in principle add an i82378 PCI->ISA bridge. Also, CONFIG_IDE_CORE which is already in pci.mak requires ISA support. We also explicitly enable ISA on some other non-PCI platforms which include ISA devices: moxie, sparc and unicore32. We may want to pare this down in future. The platforms that will lose ISA by default are: cris, lm32, microblazeel, microblaze, openrisc, s390x, tricore, xtensaeb, xtensa. As far as I can tell none of these ever used ISA. Signed-off-by: David Gibson Acked-by: Michael S. Tsirkin Reviewed-by: Markus Armbruster Reviewed-by: Edgar E. Iglesias Reviewed-by: Michael S. Tsirkin --- default-configs/moxie-softmmu.mak | 1 + default-configs/pci.mak | 2 ++ default-configs/sparc-softmmu.mak | 1 + default-configs/unicore32-softmmu.mak | 1 + hw/isa/Makefile.objs | 2 +- 5 files changed, 6 insertions(+), 1 deletion(-) diff --git a/default-configs/moxie-softmmu.mak b/default-configs/moxie-soft= mmu.mak index 7e22863..e00d099 100644 --- a/default-configs/moxie-softmmu.mak +++ b/default-configs/moxie-softmmu.mak @@ -1,5 +1,6 @@ # Default configuration for moxie-softmmu =20 +CONFIG_ISA_BUS=3Dy CONFIG_MC146818RTC=3Dy CONFIG_SERIAL=3Dy CONFIG_SERIAL_ISA=3Dy diff --git a/default-configs/pci.mak b/default-configs/pci.mak index d8d6548..60dc651 100644 --- a/default-configs/pci.mak +++ b/default-configs/pci.mak @@ -1,4 +1,6 @@ CONFIG_PCI=3Dy +# For now, CONFIG_IDE_CORE requires ISA, so we enable it here +CONFIG_ISA_BUS=3Dy CONFIG_VIRTIO_PCI=3Dy CONFIG_VIRTIO=3Dy CONFIG_USB_UHCI=3Dy diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-soft= mmu.mak index ab796b3..004b0f4 100644 --- a/default-configs/sparc-softmmu.mak +++ b/default-configs/sparc-softmmu.mak @@ -1,5 +1,6 @@ # Default configuration for sparc-softmmu =20 +CONFIG_ISA_BUS=3Dy CONFIG_ECC=3Dy CONFIG_ESP=3Dy CONFIG_ESCC=3Dy diff --git a/default-configs/unicore32-softmmu.mak b/default-configs/unicor= e32-softmmu.mak index de38577..5f6c4a8 100644 --- a/default-configs/unicore32-softmmu.mak +++ b/default-configs/unicore32-softmmu.mak @@ -1,4 +1,5 @@ # Default configuration for unicore32-softmmu +CONFIG_ISA_BUS=3Dy CONFIG_PUV3=3Dy CONFIG_PTIMER=3Dy CONFIG_PCKBD=3Dy diff --git a/hw/isa/Makefile.objs b/hw/isa/Makefile.objs index 9164556..fb37c55 100644 --- a/hw/isa/Makefile.objs +++ b/hw/isa/Makefile.objs @@ -1,4 +1,4 @@ -common-obj-y +=3D isa-bus.o +common-obj-$(CONFIG_ISA_BUS) +=3D isa-bus.o common-obj-$(CONFIG_APM) +=3D apm.o common-obj-$(CONFIG_I82378) +=3D i82378.o common-obj-$(CONFIG_PC87312) +=3D pc87312.o --=20 2.9.3