From nobody Sun Oct 5 01:45:09 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551727338115825.3354177531987; Mon, 4 Mar 2019 11:22:18 -0800 (PST) Received: from localhost ([127.0.0.1]:59533 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tAB-00031V-SC for importer@patchew.org; Mon, 04 Mar 2019 14:22:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45858) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCX-0001uM-Nc for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCW-00041s-UF for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:33 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:50510) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCW-0003z9-MP for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:32 -0500 Received: by mail-wm1-x344.google.com with SMTP id x7so147705wmj.0 for ; Mon, 04 Mar 2019 10:20:32 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=q681eZ3/ZVDBq9HY/hNXQJbOyNHu/GFvFE9yEiWiSWs=; b=jHWT0QjpglYZ39fhV9pxYujxCoGFgcZ60HaHG18sMIlnRAuGF9iMYtF7ghe4Em7vFx ANEmDDTUpcvIk0qiK9mqTe/WjikI5aoOHfUoknOipT2fvJTLMdfqXWhseur4js4vZzBI +F/8YJKjs4aV8892ETOhB+vGwiwpc1FfspfeTy+7EhGV3B8rmcKt2jeQlokxrXl2OeYU humGVDAp81i3k2/y79B1hZQyagUXw7Uvtf4XbdCNfWMYIt6SYuRemxzH/sob4sMl4Vra f73IGUt6RXJMYKDnSwOaPW15li+zJO80C40+gXcMwr7h5iiF0JS1doruMM3yqFNDJDKn wUuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=q681eZ3/ZVDBq9HY/hNXQJbOyNHu/GFvFE9yEiWiSWs=; b=IBR1yAz0gqN0ncatHVlNBwTgR36gDk/Zt8kFWgpaDFJPP81moUOOdmgzjKSXUhUPcE ofHOcMclxwEsDTFHJBbtmnHWWWJkn3k3A8m+6/kcdnX8vcGTrHu1AiiOHgTrLjbZKahZ TQ1ChtuiOjq/GuCiP48UoBVOu1UkV7sCBFcsjsiNWFwKA7Lnay9ienjKzVKPnFYdWIsm 5lf9uJr7LqtD/JvrWmmECY8OisDrawyP8EZUQXvCbtvXVljsDZsTOZ6a+9oGcXiNx5G9 zU3W0BnZNTGKouELaVT2Ro+DN+6olgaeFmsGCSO+7g66uKnYzgB9xllAJTscTyrpbGD5 iqGQ== X-Gm-Message-State: APjAAAXd/Ui9zFg3+NfKlwJdJ5IfPQnqTKAe+RoFc1f5Xe4yUrwe5bxY OAM1FB3gDhR3iNqtMTnC6RG4ajL5 X-Google-Smtp-Source: APXvYqxldSqxnMXIfWY7Xin7MvFS0mj5qypeRbYaCjaOIEoRz7yzDnPRw+Z1KQPIHNyt8Kg0ceL74A== X-Received: by 2002:a1c:80d6:: with SMTP id b205mr268343wmd.109.1551723631311; Mon, 04 Mar 2019 10:20:31 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:36 +0100 Message-Id: <1551723614-1823-17-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1551723614-1823-1-git-send-email-pbonzini@redhat.com> References: <1551723614-1823-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 Subject: [Qemu-devel] [PULL 16/54] build: convert sound.mak to Kconfig 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: Yang Zhong , thuth@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" There is really nothing special in these devices; they are just ISA devices. Instead of including them for each target, set CONFIG_ISA_BUS to true, and make the devices default to present whenever ISA is available. More conversion of ISA devices will follow. Done with the following script: while read i; do i=3D${i%=3Dy}; i=3D${i#CONFIG_} sed -i -e'/^config '$i'$/!b' -en \ -e'a\' -e' default y\' -e' depends on ISA_BUS' \ `grep -lw $i hw/*/Kconfig` done < default-configs/sound.mak Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth Message-Id: <20190123065618.3520-32-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- default-configs/i386-softmmu.mak | 2 +- default-configs/mips-softmmu-common.mak | 2 +- default-configs/ppc-softmmu.mak | 2 +- default-configs/sound.mak | 4 ---- hw/audio/Kconfig | 8 ++++++++ 5 files changed, 11 insertions(+), 7 deletions(-) delete mode 100644 default-configs/sound.mak diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index b4dc3a0..075d501 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -2,7 +2,7 @@ =20 CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy -include sound.mak +CONFIG_ISA_BUS=3Dy include usb.mak include hyperv.mak CONFIG_TEST_DEVICES=3Dy diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips= -softmmu-common.mak index 9c2146e..6d5882b 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -1,7 +1,7 @@ # Common mips*-softmmu CONFIG defines =20 -include sound.mak include usb.mak +CONFIG_ISA_BUS=3Dy CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_ESP=3Dy diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index 74e31a6..1871185 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -1,7 +1,7 @@ # Default configuration for ppc-softmmu =20 -include sound.mak include usb.mak +CONFIG_ISA_BUS=3Dy CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_TEST_DEVICES=3Dy diff --git a/default-configs/sound.mak b/default-configs/sound.mak deleted file mode 100644 index 4f22c34..0000000 --- a/default-configs/sound.mak +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_SB16=3Dy -CONFIG_ADLIB=3Dy -CONFIG_GUS=3Dy -CONFIG_CS4231A=3Dy diff --git a/hw/audio/Kconfig b/hw/audio/Kconfig index 6517e90..01aea55 100644 --- a/hw/audio/Kconfig +++ b/hw/audio/Kconfig @@ -1,5 +1,7 @@ config SB16 bool + default y + depends on ISA_BUS =20 config ES1370 bool @@ -13,12 +15,18 @@ config AC97 =20 config ADLIB bool + default y + depends on ISA_BUS =20 config GUS bool + default y + depends on ISA_BUS =20 config CS4231A bool + default y + depends on ISA_BUS =20 config HDA bool --=20 1.8.3.1