From nobody Mon Feb 9 05:29:34 2026 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 (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548413243099820.2767131919658; Fri, 25 Jan 2019 02:47:23 -0800 (PST) Received: from localhost ([127.0.0.1]:41843 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmz15-0005eN-Rv for importer@patchew.org; Fri, 25 Jan 2019 05:47:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58409) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyOz-0007qf-M5 for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:08:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyOy-00027c-0w for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:57 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:36410) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyOx-00026b-Oq for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:07:55 -0500 Received: by mail-wm1-x330.google.com with SMTP id p6so6036198wmc.1 for ; Fri, 25 Jan 2019 02:07:55 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.07.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:07:53 -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=5GJmCa46c9v2SV5H7VSyMVADrPZaPYSSVu88NthNycc=; b=hgsgsfICTcDZlhzeK9VqK+WtCuqY79DsKqRqaETio0cSTlCvGuy9BvO2NuTWBbgN6p oJ1FpJJWR2c2rlB+oMCDjX5qmXI5QoLs4MFdnPhrB5XmatzzAwFbiyIZVT9VzA3Yrjb4 xWMxnsE+l4Bw7m5fXNylv5NzUp7sfr0ysw6i8nVzNGbWYhhMpBhHA3mXTNRD6RlpnzR6 CFgB+DWI4xqvRU1NdSFP2yUgQHsE6cSSMR2X033s3otlDiPvklbqpU0TL1X73cg2aJro eRmJxOZ4mWFv94izO+1s4WQpmYYqkj4gaqPAQIsLS/EyrYa/M+ODs8m1sp1c8iWdpqO+ EAKw== 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=5GJmCa46c9v2SV5H7VSyMVADrPZaPYSSVu88NthNycc=; b=fSPF/8YHcUeA566sTjd9CYrEByqjf0MvEzBcbGXMM2BRL1OpH9kjxHrjig2+coXeLi HBEqw2AYjaVsa3zk4QtVTHTm0iFdcl5MjA7Iri+jxHIaoVU7zSiNpftkA7gWIkIS4ncg a11kBnlT73TMWr3IBIEKfzFg8Mw6x8u/ao4CMSWYJTzjOL4quLGKr6D5FSQJWnt7zv7x JWltT4ZRK6PYH2RgU1icyAe5/Nk4PkrgjL0pKy3sOqBSPOTV1+wQ8zAHlwe8AWbQ+u+F 4bEZph1S3q2nM5DHoZXEsvspQBaUE4yFgITmwqhsi8//cGuvjmRWFpXQ7YEd9UzeYxy1 YVvA== X-Gm-Message-State: AJcUukcuu5cJtSI7sW7AdDvcdg5LNftHqm2V82FU7nIdLZ1ZWxzHzHhA QhapytDVM222akpUNIEM6w/Aj4by X-Google-Smtp-Source: ALg8bN6E4aSCy9c6Nm9vo5ISIspjwZVSht+w5+B9KeLzOAiknw276BHJLfCVsntpbKswuA/FaT6ssw== X-Received: by 2002:a1c:b10a:: with SMTP id a10mr6094329wmf.148.1548410874370; Fri, 25 Jan 2019 02:07:54 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:07:00 +0100 Message-Id: <1548410831-19553-42-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::330 Subject: [Qemu-devel] [PATCH 41/52] isa: express dependencies with 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" Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Message-Id: <20190123065618.3520-36-yang.zhong@intel.com> Reviewed-by: Thomas Huth Signed-off-by: Paolo Bonzini --- default-configs/i386-softmmu.mak | 9 --------- hw/audio/Kconfig | 2 ++ hw/block/Kconfig | 2 ++ hw/char/Kconfig | 6 ++++++ hw/display/Kconfig | 3 +++ hw/dma/Kconfig | 1 + hw/i386/Kconfig | 1 + hw/ide/Kconfig | 1 + hw/input/Kconfig | 2 ++ hw/isa/Kconfig | 7 +++++++ hw/misc/Kconfig | 4 ++++ hw/net/Kconfig | 3 +++ hw/sparc64/Kconfig | 1 + hw/watchdog/Kconfig | 2 ++ 14 files changed, 35 insertions(+), 9 deletions(-) diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index 4073c62..8e6a810 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -8,19 +8,12 @@ CONFIG_VGA_ISA=3Dy CONFIG_VMWARE_VGA=3Dy CONFIG_VMXNET3_PCI=3Dy CONFIG_VIRTIO_VGA=3Dy -CONFIG_VMMOUSE=3Dy CONFIG_IPMI=3Dy CONFIG_IPMI_LOCAL=3Dy CONFIG_IPMI_EXTERN=3Dy CONFIG_ISA_IPMI_KCS=3Dy CONFIG_ISA_IPMI_BT=3Dy -CONFIG_SERIAL=3Dy -CONFIG_SERIAL_ISA=3Dy -CONFIG_PARALLEL=3Dy CONFIG_I8254=3Dy -CONFIG_PCSPK=3Dy -CONFIG_PCKBD=3Dy -CONFIG_FDC=3Dy CONFIG_ACPI=3Dy CONFIG_ACPI_X86=3Dy CONFIG_ACPI_X86_ICH=3Dy @@ -30,14 +23,12 @@ CONFIG_APM=3Dy CONFIG_I8257=3Dy CONFIG_IDE_ISA=3Dy CONFIG_IDE_PIIX=3Dy -CONFIG_NE2000_ISA=3Dy CONFIG_HPET=3Dy CONFIG_APPLESMC=3Dy CONFIG_I8259=3Dy CONFIG_PFLASH_CFI01=3Dy CONFIG_MC146818RTC=3Dy CONFIG_PCI_PIIX=3Dy -CONFIG_WDT_IB700=3Dy CONFIG_ISA_DEBUG=3Dy CONFIG_ISA_TESTDEV=3Dy CONFIG_VMPORT=3Dy diff --git a/hw/audio/Kconfig b/hw/audio/Kconfig index dedb513..01aea55 100644 --- a/hw/audio/Kconfig +++ b/hw/audio/Kconfig @@ -35,6 +35,8 @@ config HDA =20 config PCSPK bool + default y + depends on I8254 =20 config WM8750 bool diff --git a/hw/block/Kconfig b/hw/block/Kconfig index f7b9d3a..dc91e67 100644 --- a/hw/block/Kconfig +++ b/hw/block/Kconfig @@ -1,5 +1,7 @@ config FDC bool + default y + depends on ISA_BUS =20 config SSI_M25P80 bool diff --git a/hw/char/Kconfig b/hw/char/Kconfig index 6eba69a..fc18481 100644 --- a/hw/char/Kconfig +++ b/hw/char/Kconfig @@ -3,6 +3,8 @@ config ESCC =20 config PARALLEL bool + default y + depends on ISA_BUS =20 config PL011 bool @@ -12,11 +14,15 @@ config SERIAL =20 config SERIAL_ISA bool + default y + depends on ISA_BUS + select SERIAL =20 config SERIAL_PCI bool default y if PCI_DEVICES depends on PCI + select SERIAL =20 config VIRTIO_SERIAL bool diff --git a/hw/display/Kconfig b/hw/display/Kconfig index f8d63c6..64a5764 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -39,9 +39,12 @@ config VGA_PCI =20 config VGA_ISA bool + depends on ISA_BUS + select VGA =20 config VGA_ISA_MM bool + select VGA =20 config VMWARE_VGA bool diff --git a/hw/dma/Kconfig b/hw/dma/Kconfig index b9ce1c5..751dec5 100644 --- a/hw/dma/Kconfig +++ b/hw/dma/Kconfig @@ -9,6 +9,7 @@ config PL330 =20 config I82374 bool + select I8257 =20 config I8257 bool diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index 9a0e559..ff41be3 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -10,6 +10,7 @@ config I440FX =20 config ISAPC bool + select ISA_BUS =20 config Q35 bool diff --git a/hw/ide/Kconfig b/hw/ide/Kconfig index 246e27b..ab47b6a 100644 --- a/hw/ide/Kconfig +++ b/hw/ide/Kconfig @@ -12,6 +12,7 @@ config IDE_PCI =20 config IDE_ISA bool + depends on ISA_BUS select IDE_QDEV =20 config IDE_PIIX diff --git a/hw/input/Kconfig b/hw/input/Kconfig index 98a18a1..bdb4237 100644 --- a/hw/input/Kconfig +++ b/hw/input/Kconfig @@ -6,6 +6,8 @@ config LM832X =20 config PCKBD bool + default y + depends on ISA_BUS =20 config PL050 bool diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig index b59d074..af68af9 100644 --- a/hw/isa/Kconfig +++ b/hw/isa/Kconfig @@ -6,18 +6,25 @@ config APM =20 config I82378 bool + select ISA_BUS =20 config PC87312 bool + select ISA_BUS =20 config PIIX4 bool + select ISA_BUS =20 config VT82C686 bool + select ISA_BUS =20 config SMC37C669 bool + select ISA_BUS =20 config LPC_ICH9 bool + select ISA_BUS + select ACPI_X86_ICH diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index c85c085..ca051fb 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -1,5 +1,6 @@ config APPLESMC bool + depends on ISA_BUS =20 config MAX111X bool @@ -12,9 +13,11 @@ config TMP421 =20 config ISA_DEBUG bool + depends on ISA_BUS =20 config SGA bool + depends on ISA_BUS =20 config ISA_TESTDEV bool @@ -93,6 +96,7 @@ config IOTKIT_SYSINFO =20 config PVPANIC bool + depends on ISA_BUS =20 config AUX bool diff --git a/hw/net/Kconfig b/hw/net/Kconfig index d50e301..6d15720 100644 --- a/hw/net/Kconfig +++ b/hw/net/Kconfig @@ -48,6 +48,9 @@ config LAN9118 =20 config NE2000_ISA bool + default y + depends on ISA_BUS + depends on PCI # for NE2000State =20 config OPENCORES_ETH bool diff --git a/hw/sparc64/Kconfig b/hw/sparc64/Kconfig index 8c13345..41f7295 100644 --- a/hw/sparc64/Kconfig +++ b/hw/sparc64/Kconfig @@ -1,5 +1,6 @@ config SUN4U bool + select ISA_BUS =20 config NIAGARA bool diff --git a/hw/watchdog/Kconfig b/hw/watchdog/Kconfig index edb3d42..35ccb72 100644 --- a/hw/watchdog/Kconfig +++ b/hw/watchdog/Kconfig @@ -8,6 +8,8 @@ config WDT_IB6300ESB =20 config WDT_IB700 bool + default y + depends on ISA_BUS =20 config WDT_DIAG288 bool --=20 1.8.3.1