From nobody Fri Nov 7 04:18:27 2025 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.zohomail.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; dmarc=fail(p=none dis=none) header.from=intel.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1545893188738540.0923376514489; Wed, 26 Dec 2018 22:46:28 -0800 (PST) Received: from localhost ([127.0.0.1]:49792 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gcPR5-0007V8-9Q for importer@patchew.org; Thu, 27 Dec 2018 01:46:27 -0500 Received: from eggs.gnu.org ([208.118.235.92]:55119) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gcPHG-00041R-VS for qemu-devel@nongnu.org; Thu, 27 Dec 2018 01:36:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gcPH9-0005XF-DZ for qemu-devel@nongnu.org; Thu, 27 Dec 2018 01:36:16 -0500 Received: from mga11.intel.com ([192.55.52.93]:57867) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gcPH7-0004Bd-4V for qemu-devel@nongnu.org; Thu, 27 Dec 2018 01:36:11 -0500 Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Dec 2018 22:35:38 -0800 Received: from he.bj.intel.com ([10.238.157.85]) by orsmga006.jf.intel.com with ESMTP; 26 Dec 2018 22:35:36 -0800 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,404,1539673200"; d="scan'208";a="103617389" From: Yang Zhong To: qemu-devel@nongnu.org Date: Thu, 27 Dec 2018 14:34:16 +0800 Message-Id: <20181227063419.12981-23-yang.zhong@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181227063419.12981-1-yang.zhong@intel.com> References: <20181227063419.12981-1-yang.zhong@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.93 Subject: [Qemu-devel] [RFC PATCH 22/25] i386-softmmu.mak: remove all CONFIG_* except boards definitions 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, peter.maydell@linaro.org, thuth@redhat.com, sameo@linux.intel.com, pbonzini@redhat.com, ehabkost@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" %-softmmu.mak only keep boards definitions in Kconfig mode. Signed-off-by: Yang Zhong --- default-configs/i386-softmmu.mak | 30 ------------------------------ hw/i386/Kconfig | 30 ++++++++++++++++++++++++++++++ hw/ide/Kconfig | 2 +- hw/net/Kconfig | 2 ++ 4 files changed, 33 insertions(+), 31 deletions(-) diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index d3488b5a6d..7b083412af 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -1,35 +1,5 @@ # Default configuration for i386-softmmu =20 -CONFIG_VMXNET3_PCI=3Dy -CONFIG_IPMI=3Dy -CONFIG_IPMI_LOCAL=3Dy -CONFIG_IPMI_EXTERN=3Dy -CONFIG_ISA_IPMI_KCS=3Dy -CONFIG_ISA_IPMI_BT=3Dy - -# Optional devices: -# -CONFIG_HPET=3Dy -CONFIG_APPLESMC=3Dy -CONFIG_PFLASH_CFI01=3Dy -CONFIG_ISA_TESTDEV=3Dy -CONFIG_VMPORT=3Dy -CONFIG_SGA=3Dy -CONFIG_PVPANIC=3Dy -CONFIG_MEM_DEVICE=3Dy -CONFIG_DIMM=3Dy -CONFIG_NVDIMM=3Dy -CONFIG_ACPI_NVDIMM=3Dy -CONFIG_PCIE_PORT=3Dy -CONFIG_SMBIOS=3Dy -CONFIG_PXB=3Dy -CONFIG_ACPI_VMGENID=3Dy -CONFIG_FW_CFG_DMA=3Dy -CONFIG_I2C=3Dy -CONFIG_SEV=3D$(CONFIG_KVM) -CONFIG_VTD=3Dy -CONFIG_AMD_IOMMU=3Dy - # Boards: # CONFIG_ISAPC=3Dy diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index af4b81bae1..c00080ac76 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -1,6 +1,9 @@ config KVM bool =20 +config SEV + bool + config PC bool select ISA_DEBUG @@ -13,6 +16,29 @@ config PC select TPM_TIS if TPM select HYPERV select HYPERV_TESTDEV + select DIMM + select AMD_IOMMU + select NVDIMM + select ACPI_NVDIMM + select ACPI_VMGENID + select SMBIOS + select IPMI + select IPMI_LOCAL + select IPMI_EXTERN + select ISA_IPMI_KCS + select ISA_IPMI_BT + select PFLASH_CFI01 + select I2C + select PVPANIC + select PXB + select VMPORT + select VMMOUSE + select SEV if KVM + select HPET + select APPLESMC + select ISA_TESTDEV + select SGA + select FW_CFG_DMA =20 config PC_PCI bool @@ -37,6 +63,7 @@ config I440FX select PCI_PIIX select FDC select IDE_PIIX + select VTD =20 config ISAPC bool @@ -55,6 +82,8 @@ config Q35 select PCI_Q35 select LPC_ICH9 select AHCI + select VTD + select PCIE_PORT =20 config VTD bool @@ -67,3 +96,4 @@ config VMPORT =20 config VMMOUSE bool + depends on VMPORT diff --git a/hw/ide/Kconfig b/hw/ide/Kconfig index 41d3057675..b9ba571c04 100644 --- a/hw/ide/Kconfig +++ b/hw/ide/Kconfig @@ -17,7 +17,7 @@ config IDE_ISA =20 config IDE_PIIX bool - depends on PCI + select IDE_PCI select IDE_QDEV =20 config IDE_CMD646 diff --git a/hw/net/Kconfig b/hw/net/Kconfig index 8b65de1d7f..3be0571649 100644 --- a/hw/net/Kconfig +++ b/hw/net/Kconfig @@ -108,6 +108,7 @@ config ROCKER =20 config CAN_BUS bool + default y =20 config CAN_PCI bool @@ -116,3 +117,4 @@ config CAN_PCI =20 config CAN_SJA1000 bool + default y --=20 2.17.1