From nobody Fri Dec 19 07:47:18 2025 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) 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 1549562405069276.2928459223433; Thu, 7 Feb 2019 10:00:05 -0800 (PST) Received: from localhost ([127.0.0.1]:44456 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnxp-0003NX-LT for importer@patchew.org; Thu, 07 Feb 2019 12:59:53 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57322) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnvs-0001un-Ui for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnvr-0002D2-MR for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:52 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:33024) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnvr-0002Ap-D9 for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:51 -0500 Received: by mail-wm1-x342.google.com with SMTP id h22so4956411wmb.0 for ; Thu, 07 Feb 2019 09:57:50 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.57.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:57:48 -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=yntSKXC+30q5agoc6rF4xjwM5YuyOFQdcihbw8kMZp4=; b=SkMDi+yrQaLTNZrDeDKAfSGmvIeiKYBtsQ5BSCFCdoNprtOoOLuSWVKarbqrog2dJN JR6HPtzOTBiBaN1QfscU9Th44s4Fjw7uBRxoJBLAshLxUVPe5QxXeUDzXthrYLXoGPjV yCP8abxb2lbDWYPL2scTZb6Ff9Xhrt13OUorlfovgRvLZJXk5pjKxriI1cWJr63Gtmxs UyZv6laVQVkxmKxdSKzseuUbOSVQNg4exp/CTOz5iXk3BStl93FyQY25oFVTcI6662TS vIIrGeTkA9XlpkFGv8yncrPITHcEJJrn0vTrlQfLqcL4juf8cJqPYAGJvPmt+B1c2uw6 zeaw== 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=yntSKXC+30q5agoc6rF4xjwM5YuyOFQdcihbw8kMZp4=; b=QMrMzSCsps5ETGeMtiFz25ZFcWtW+qVyZh3PJX4T1wMdxQXIFUS6biCsGfFVWxRiEs xHhKkUzvqkYkBSHCIdDDBpiQMO42sBzTulHWcHlY4A0Map9XifhaF/kOMLkfDHVz4b7p OLsf0rsEdQJX5fYnAr8BBiR+tUq0YAUwYYNj7bDM7Gnf/Co3DkxrrgmkAEKXQgJY/MW1 +zQ+ZInE0UP2onXcIEcp9u0+sLOL5JFywg/bx9WrvRbxOIKrLpMCJMRj3Ru5Lqyk4b+a SGvBK6OKm4DNuux4ebmop9sLy0nGyJen2IWvSqHgosgQ0AcT2C2P9HeQCXUFQ4EarIF4 UUDw== X-Gm-Message-State: AHQUAubkMk/gYbMnYjktZlHkkF/OmKmLQG2cr2F5I7pMGP9Nq7QUt9dd k7nHkRiMhUKIFMww3K2COtsuzIH7 X-Google-Smtp-Source: AHgI3IaEl/tty7T8NGWL0Kus5Cv/x6qco5dEG3Ovv+64NpzOFg7zskpavkG+3h5ta/YpoWE0sJaKBw== X-Received: by 2002:a7b:c144:: with SMTP id z4mr8038381wmi.68.1549562269435; Thu, 07 Feb 2019 09:57:49 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:56:55 +0100 Message-Id: <1549562254-41157-13-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-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::342 Subject: [Qemu-devel] [PATCH 12/51] 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: thuth@redhat.com, philmd@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 80c4b49..db841b6 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 88f28e5..4a48960 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 f47c069..f1d06f4 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 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