From nobody Mon Feb 9 17:59:05 2026 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 1548412787267357.82504403364214; Fri, 25 Jan 2019 02:39:47 -0800 (PST) Received: from localhost ([127.0.0.1]:41692 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyth-0007ic-6M for importer@patchew.org; Fri, 25 Jan 2019 05:39:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58424) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyP2-0007sQ-GW for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:08:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOu-00023c-OJ for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:54 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:40513) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOu-00022Z-HA for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:52 -0500 Received: by mail-wm1-x343.google.com with SMTP id f188so5997750wmf.5 for ; Fri, 25 Jan 2019 02:07:52 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:50 -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=ttiRuZxRTdDEgorCA3qjfY7LKpLs/nJntQ6NlZIXLhs=; b=gpDxanHEENdbuq/uXLCktvDnNyOnYaskctMX5QdbyMusW9tWrvWR1n6VI9TrtjUPYI umAq9LsciOcsw1h81+7sWQnSA2o4XYhGCumlDVvMO1uiPIUtrxaJOQ8Fd1G/VITuFgwQ hPYqtt3B+7jLqIgBQCnq77RLF+hPy3GG0N77XnupDBGbyaqYflwkl9+wbFsAaaZf8DTo a7fHYWLA3pIMlaIl5cy1pj87Xx9ZQPZaV6VcS/hFOf7CDE0Y/PriB2ZOr1ZNXCo+Bxoa gvMQDPZGSY80Ge1tfd+JaWyLiC/5R/EOWfxrla4T16W416MIysdVbJtStc6/43iYo603 6kjQ== 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=ttiRuZxRTdDEgorCA3qjfY7LKpLs/nJntQ6NlZIXLhs=; b=mzjdlNSLiOm88PHGdgf52qzoeQV6jWz+4odRAC6XrVcwcfOeZnd9fxnwNZs4P6dP7O KN0rRoBuSR243EwH5TI1QbSZGyJD5CZwhm+MzqLkaapW0nDrZoNDgvJmYcGzgNi6EQxX fpsTQFgbGgERz7cUNLQnTkmYWvf+sISznjdXeLteSdpSJWkKsyQ9voyNhLJOKB5JimnC jfWtMdYIdVnAKF+b/Gt8PpSHlgx1QrMJZjPd1mskVYhLqvcgQ2Sipq6LJX+0SV+k0Mur Tmon/leRo1M98nj+pHusDCj8diGZ1JGRLdllL4yqg43Cdjb4AymvY6cQTzPG+36TzLvt gVwg== X-Gm-Message-State: AJcUukffPmJx6S32+OjItQGlvXmCtEhIS7bTX4sK33Egc7sySuy87eFG uvRwVE4XPoKS6lfn7t47I0GJau0N X-Google-Smtp-Source: ALg8bN7mJF5vlE/mEAnBYRepygptPC9w7/pxEC40recM3lIOsXPsW/qSLnyCZCtSYBTUomiXwTEHNw== X-Received: by 2002:a1c:5984:: with SMTP id n126mr6020109wmb.62.1548410871119; Fri, 25 Jan 2019 02:07:51 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:06:57 +0100 Message-Id: <1548410831-19553-39-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-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::343 Subject: [Qemu-devel] [PATCH 38/52] 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@intel.com, 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 a139bd5..9eb9351 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_VGA_ISA=3Dy diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips= -softmmu-common.mak index 246af88..981ea2c 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 763184f..dba071a 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -1,9 +1,9 @@ # Default configuration for ppc-softmmu =20 -include sound.mak include usb.mak CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy +CONFIG_ISA_BUS=3Dy =20 # For embedded PPCs: CONFIG_PPC4XX=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 aa5c82b..dedb513 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