From nobody Sun Oct 5 01:45:08 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 (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551728118783793.1412499620913; Mon, 4 Mar 2019 11:35:18 -0800 (PST) Received: from localhost ([127.0.0.1]:59702 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tMp-0005bM-NP for importer@patchew.org; Mon, 04 Mar 2019 14:35:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46081) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCs-0002Ek-0I for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCo-0004Zh-74 for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:51 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:44919) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCn-0004SC-Sg for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:50 -0500 Received: by mail-wr1-x42c.google.com with SMTP id w2so6626058wrt.11 for ; Mon, 04 Mar 2019 10:20:47 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:45 -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=/MBMqj8DSW6I8JeeXskXUQrwcBwgCamQ4BeDh1MvYPo=; b=Tubb15fXQzwXYP9+WCTCRRHRJWzMaqsZHsbvRTaZ4E5K/WDJK4TbPJ9UFZSvgGR02W kAXQ3qsYJ1BZfxUBHRjy6jf9T/73wyDE4jgQQLc8VI/PdO9zNRSo15vbADpNpjDEhjm1 a5kv2o4YY2PaEabuk3Cn8PtBXp/+Z9hecmihrsRYG3Cpner8FW0YONJKTnpdJmdVlDRo 8yI5J19DtTJTdrcNiCJIC+b5T5hMwPcV3mqBLx/dfPuUvclon8AbQ+kcK8yFfT9r+Z2M HZ9TbzetA7aq1zkd+ZR3glCcFuJIAbHtw5qqqhVzQYbtELHKHUk+GFk4MVMl51L+d2g9 eP9w== 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=/MBMqj8DSW6I8JeeXskXUQrwcBwgCamQ4BeDh1MvYPo=; b=RNRWEGnUGEnRYESKCiYKBXsqh0KYS1w6OYz1yDBbnjuY1kHdy2wByepwqUT2VTvji7 N/dGEQPFftvbktwq2WN4jk8NPcPtEyp63pwsDvwQBPzE621RAwUCRLadZRBZ3DQ8oA71 huzw+ffmlEuX+0FCu2UYxVmlRuyV9fU2GINPfbw5ABX5SkEK/T6P1658YYt0nxuFuman 5peg8fnEiRPBK2S7jpZp9dKZ/1+2zNOv7Vjs/2iM+H54qIvQOrpOiPawKhYsKGK6GbDU qVGKMf0FVg0AOrA1OqhrkgPvGU4b6cPuHWFm+qG1AkRoGC3/E+N+tae807tGXCgvoTPA vamQ== X-Gm-Message-State: APjAAAVE9Oy77Q0jIqRjSxCTyiOk+vvDcmyHBFdrUN68i046ycUp3KCZ 1BGcQs7iDv6MxVLjaGIVDep5pcce X-Google-Smtp-Source: APXvYqxznx/4iBxEdsQv5+WFmW6YHpoevTee62IFWF5FXp0Ssey3j4cmgVIa68LjHdht+zMMvP80qg== X-Received: by 2002:adf:f391:: with SMTP id m17mr12802625wro.137.1551723646219; Mon, 04 Mar 2019 10:20:46 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:51 +0100 Message-Id: <1551723614-1823-32-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::42c Subject: [Qemu-devel] [PULL 31/54] 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 , 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" From: Yang Zhong %-softmmu.mak only keep boards definitions in Kconfig mode. Signed-off-by: Yang Zhong Message-Id: <20190123065618.3520-43-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- default-configs/i386-softmmu.mak | 37 ++++++++++++++++++------------------- hw/acpi/Kconfig | 6 ++++++ hw/i386/Kconfig | 15 +++++++++++++++ hw/mem/Kconfig | 2 ++ hw/pci-bridge/Kconfig | 1 + hw/timer/Kconfig | 1 + 6 files changed, 43 insertions(+), 19 deletions(-) diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index e779ee1..ba3fb3f 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -1,25 +1,24 @@ # Default configuration for i386-softmmu =20 -CONFIG_VMXNET3_PCI=3Dy -CONFIG_ISA_IPMI_KCS=3Dy -CONFIG_ISA_IPMI_BT=3Dy - -# Optional devices: +# Uncomment the following lines to disable these optional devices: # -CONFIG_HPET=3Dy -CONFIG_APPLESMC=3Dy -CONFIG_PFLASH_CFI01=3Dy -CONFIG_ISA_DEBUG=3Dy -CONFIG_ISA_TESTDEV=3Dy -CONFIG_TEST_DEVICES=3Dy -CONFIG_SGA=3Dy -CONFIG_PVPANIC=3Dy -CONFIG_MEM_DEVICE=3Dy -CONFIG_NVDIMM=3Dy -CONFIG_ACPI_NVDIMM=3Dy -CONFIG_PXB=3Dy -CONFIG_ACPI_VMGENID=3Dy -CONFIG_PCI_DEVICES=3Dy +#CONFIG_AMD_IOMMU=3Dn +#CONFIG_APPLESMC=3Dn +#CONFIG_FDC=3Dn +#CONFIG_HPET=3Dn +#CONFIG_HYPERV=3Dn +#CONFIG_ISA_DEBUG=3Dn +#CONFIG_ISA_IPMI_BT=3Dn +#CONFIG_ISA_IPMI_KCS=3Dn +#CONFIG_PCI_DEVICES=3Dn +#CONFIG_PVPANIC=3Dn +#CONFIG_QXL=3Dn +#CONFIG_SEV=3Dn +#CONFIG_SGA=3Dn +#CONFIG_TEST_DEVICES=3Dn +#CONFIG_TPM_CRB=3Dn +#CONFIG_TPM_TIS=3Dn +#CONFIG_VTD=3Dn =20 # Boards: # diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig index 035a28f..eca3bee 100644 --- a/hw/acpi/Kconfig +++ b/hw/acpi/Kconfig @@ -4,6 +4,9 @@ config ACPI config ACPI_X86 bool select ACPI + select ACPI_NVDIMM + select ACPI_CPU_HOTPLUG + select ACPI_MEMORY_HOTPLUG =20 config ACPI_X86_ICH bool @@ -18,6 +21,9 @@ config ACPI_MEMORY_HOTPLUG =20 config ACPI_NVDIMM bool + depends on ACPI =20 config ACPI_VMGENID bool + default y + depends on PC diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index ea72f48..78fd703 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -4,18 +4,32 @@ config SEV =20 config PC bool + imply APPLESMC imply HYPERV + imply ISA_IPMI_KCS + imply ISA_IPMI_BT + imply ISA_DEBUG + imply PCI_DEVICES + imply PVPANIC imply QXL imply SEV + imply SGA + imply TEST_DEVICES imply TPM_CRB imply TPM_TIS select FDC select I8259 select I8254 + select PCKBD select PCSPK select I82374 select I8257 select MC146818RTC + # Needed by the board code: + select PARALLEL + # For ACPI builder: + select SERIAL_ISA + select ACPI_VMGENID =20 config PC_PCI bool @@ -30,6 +44,7 @@ config PC_ACPI select ACPI_CPU_HOTPLUG select ACPI_MEMORY_HOTPLUG select SMBUS_EEPROM + select PFLASH_CFI01 depends on ACPI_SMBUS =20 config I440FX diff --git a/hw/mem/Kconfig b/hw/mem/Kconfig index a3a4372..d1e635c 100644 --- a/hw/mem/Kconfig +++ b/hw/mem/Kconfig @@ -6,3 +6,5 @@ config MEM_DEVICE =20 config NVDIMM bool + default y + depends on PC diff --git a/hw/pci-bridge/Kconfig b/hw/pci-bridge/Kconfig index 0519eb1..b167b98 100644 --- a/hw/pci-bridge/Kconfig +++ b/hw/pci-bridge/Kconfig @@ -5,6 +5,7 @@ config PCIE_PORT =20 config PXB bool + default y if Q35 =20 config XIO3130 bool diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig index a021c74..51921eb 100644 --- a/hw/timer/Kconfig +++ b/hw/timer/Kconfig @@ -15,6 +15,7 @@ config DS1338 =20 config HPET bool + default y if PC =20 config I8254 bool --=20 1.8.3.1