From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: Paolo Bonzini <pbonzini@redhat.com>,
qemu-devel@nongnu.org, Gerd Hoffmann <kraxel@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>
Cc: yang.zhong@intel.com, thuth@redhat.com
Subject: Re: [Qemu-devel] [PATCH 42/52] i386: express dependencies with Kconfig
Date: Fri, 1 Feb 2019 16:05:30 +0100 [thread overview]
Message-ID: <a67e6380-daf5-62d1-0f37-45f7015cc0fa@redhat.com> (raw)
In-Reply-To: <1548410831-19553-43-git-send-email-pbonzini@redhat.com>
Hi Paolo,
On 1/25/19 11:07 AM, Paolo Bonzini wrote:
> This way, the default-configs file only need to specify the boards
> and any optional devices.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> Signed-off-by: Yang Zhong <yang.zhong@intel.com>
> Message-Id: <20190123065618.3520-37-yang.zhong@intel.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> default-configs/i386-softmmu.mak | 44 ++++++--------------------------
> hw/acpi/Kconfig | 3 +++
> hw/i2c/Makefile.objs | 2 +-
> hw/i386/Kconfig | 54 ++++++++++++++++++++++++++++++++++++++++
> hw/isa/Kconfig | 1 +
> hw/pci-host/Kconfig | 4 +++
> hw/tpm/Kconfig | 2 ++
> 7 files changed, 73 insertions(+), 37 deletions(-)
>
> diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
> index 8e6a810..9eb9a5e 100644
> --- a/default-configs/i386-softmmu.mak
> +++ b/default-configs/i386-softmmu.mak
> @@ -1,11 +1,6 @@
> # Default configuration for i386-softmmu
>
> -CONFIG_PCI=y
> -CONFIG_PCI_DEVICES=y
> -CONFIG_ISA_BUS=y
> include hyperv.mak
> -CONFIG_VGA_ISA=y
> -CONFIG_VMWARE_VGA=y
> CONFIG_VMXNET3_PCI=y
> CONFIG_VIRTIO_VGA=y
> CONFIG_IPMI=y
> @@ -13,49 +8,26 @@ CONFIG_IPMI_LOCAL=y
> CONFIG_IPMI_EXTERN=y
> CONFIG_ISA_IPMI_KCS=y
> CONFIG_ISA_IPMI_BT=y
> -CONFIG_I8254=y
> -CONFIG_ACPI=y
> -CONFIG_ACPI_X86=y
> -CONFIG_ACPI_X86_ICH=y
> -CONFIG_ACPI_MEMORY_HOTPLUG=y
> -CONFIG_ACPI_CPU_HOTPLUG=y
> -CONFIG_APM=y
> -CONFIG_I8257=y
> -CONFIG_IDE_ISA=y
> -CONFIG_IDE_PIIX=y
> +
> +# Optional devices:
> +#
> CONFIG_HPET=y
> CONFIG_APPLESMC=y
> -CONFIG_I8259=y
> CONFIG_PFLASH_CFI01=y
> -CONFIG_MC146818RTC=y
> -CONFIG_PCI_PIIX=y
> -CONFIG_ISA_DEBUG=y
> CONFIG_ISA_TESTDEV=y
> -CONFIG_VMPORT=y
> CONFIG_SGA=y
> -CONFIG_LPC_ICH9=y
> -CONFIG_PCI_EXPRESS=y
> -CONFIG_PCI_EXPRESS_Q35=y
> -CONFIG_APIC=y
> -CONFIG_IOAPIC=y
> CONFIG_PVPANIC=y
> CONFIG_MEM_DEVICE=y
> -CONFIG_DIMM=y
> CONFIG_NVDIMM=y
> CONFIG_ACPI_NVDIMM=y
> -CONFIG_XIO3130=y
> -CONFIG_IOH3420=y
> -CONFIG_I82801B11=y
> -CONFIG_SMBIOS=y
> CONFIG_PXB=y
> CONFIG_ACPI_VMGENID=y
> -CONFIG_ACPI_SMBUS=y
> CONFIG_SMBUS_EEPROM=y
> -CONFIG_FW_CFG_DMA=y
> CONFIG_I2C=y
> -CONFIG_VTD=y
> -CONFIG_AMD_IOMMU=y
> -CONFIG_PAM=y
> -CONFIG_PC=y
> +CONFIG_PCI_DEVICES=y
> +
> +# Boards:
> +#
> +CONFIG_ISAPC=y
> CONFIG_I440FX=y
> CONFIG_Q35=y
> diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig
> index c485a34..035a28f 100644
> --- a/hw/acpi/Kconfig
> +++ b/hw/acpi/Kconfig
> @@ -3,15 +3,18 @@ config ACPI
>
> config ACPI_X86
> bool
> + select ACPI
>
> config ACPI_X86_ICH
> bool
> + select ACPI_X86
>
> config ACPI_CPU_HOTPLUG
> bool
>
> config ACPI_MEMORY_HOTPLUG
> bool
> + select MEM_DEVICE
>
> config ACPI_NVDIMM
> bool
> diff --git a/hw/i2c/Makefile.objs b/hw/i2c/Makefile.objs
> index 61ac50a..ff22aa6 100644
> --- a/hw/i2c/Makefile.objs
> +++ b/hw/i2c/Makefile.objs
> @@ -2,7 +2,7 @@ common-obj-$(CONFIG_I2C) += core.o smbus.o
> common-obj-$(CONFIG_SMBUS_EEPROM) += smbus_eeprom.o
> common-obj-$(CONFIG_DDC) += i2c-ddc.o
> common-obj-$(CONFIG_VERSATILE_I2C) += versatile_i2c.o
> -common-obj-$(CONFIG_ACPI_X86) += smbus_ich9.o
> +common-obj-$(CONFIG_ACPI_X86_ICH) += smbus_ich9.o
> common-obj-$(CONFIG_ACPI_SMBUS) += pm_smbus.o
> common-obj-$(CONFIG_BITBANG_I2C) += bitbang_i2c.o
> common-obj-$(CONFIG_EXYNOS4) += exynos4210_i2c.o
> diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig
> index ff41be3..8814b7c 100644
> --- a/hw/i386/Kconfig
> +++ b/hw/i386/Kconfig
> @@ -5,20 +5,73 @@ config SEV
> config PC
> bool
>
> +config PC
> + bool
> + select ISA_DEBUG
> + select I8259
> + select I8254
> + select PCSPK
> + select I82374
> + select I8257
> + select MC146818RTC
> +
> +config PC_PCI
> + bool
> + select APIC
> + select IOAPIC
> + select APM
> + select PC
> +
> +config PC_ACPI
> + bool
> + select ACPI_X86
> + select ACPI_CPU_HOTPLUG
> + select ACPI_MEMORY_HOTPLUG
> + depends on ACPI_SMBUS
> +
> config I440FX
> bool
> + select PC_PCI
> + select PC_ACPI
> + select ACPI_SMBUS
> + select PCI_PIIX
> + select FDC
> + select IDE_PIIX
> + select DIMM
> + select SMBIOS
> + select VMPORT
> + select VMMOUSE
> + select FW_CFG_DMA
>
> config ISAPC
> bool
> select ISA_BUS
> + select PC
> + select IDE_ISA
> + select VGA_ISA
> + # FIXME: it is in the same file as i440fx, and does not compile
> + # if separated
> + depends on I440FX
>
> config Q35
> bool
> + select PC_PCI
> + select PC_ACPI
> + select PCI_EXPRESS_Q35
> + select LPC_ICH9
> + select AHCI
> + select DIMM
> + select SMBIOS
> + select VMPORT
> + select VMMOUSE
> + select FW_CFG_DMA
This lacks a DISPLAY dependency?
$ i386-softmmu/qemu-system-i386 -M q35
qemu-system-i386: Unknown device 'VGA' for bus 'PCIE'
Aborted (core dumped)
PCIDevice *pci_vga_init(PCIBus *bus)
{
switch (vga_interface_type) {
case VGA_CIRRUS:
return pci_create_simple(bus, -1, "cirrus-vga");
case VGA_QXL:
return pci_create_simple(bus, -1, "qxl-vga");
case VGA_STD:
return pci_create_simple(bus, -1, "VGA");
case VGA_VMWARE:
return pci_create_simple(bus, -1, "vmware-svga");
case VGA_VIRTIO:
return pci_create_simple(bus, -1, "virtio-vga");
case VGA_NONE:
default: /* Other non-PCI types. Checking for unsupported types is
already
done in vl.c. */
return NULL;
}
}
If so, how to express "at least one of *TYPE"?
>
> config VTD
> + default y if Q35
> bool
>
> config AMD_IOMMU
> + default y if Q35
> bool
>
> config VMPORT
> @@ -26,3 +79,4 @@ config VMPORT
>
> config VMMOUSE
> bool
> + depends on VMPORT
> diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig
> index af68af9..6f0812d 100644
> --- a/hw/isa/Kconfig
> +++ b/hw/isa/Kconfig
> @@ -27,4 +27,5 @@ config SMC37C669
> config LPC_ICH9
> bool
> select ISA_BUS
> + select ACPI_SMBUS
> select ACPI_X86_ICH
> diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig
> index c01812a..ff4080c 100644
> --- a/hw/pci-host/Kconfig
> +++ b/hw/pci-host/Kconfig
> @@ -27,10 +27,14 @@ config PCI_SABRE
>
> config PCI_PIIX
> bool
> + select PCI
> + select PAM
> + select ISA_BUS
>
> config PCI_EXPRESS_Q35
> bool
> select PCI_EXPRESS
> + select PAM
>
> config PCI_EXPRESS_GENERIC_BRIDGE
> bool
> diff --git a/hw/tpm/Kconfig b/hw/tpm/Kconfig
> index db57388..8a63597 100644
> --- a/hw/tpm/Kconfig
> +++ b/hw/tpm/Kconfig
> @@ -8,6 +8,8 @@ config TPM_TIS
>
> config TPM_CRB
> bool
> + default y
> + depends on TPM && PC
>
> config TPM_PASSTHROUGH
> bool
>
next prev parent reply other threads:[~2019-02-01 15:05 UTC|newest]
Thread overview: 119+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-25 10:06 [Qemu-devel] [RFC PATCH v5 00/52] Support Kconfig in QEMU Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 01/52] arm: disable CONFIG_SERIAL_ISA Paolo Bonzini
2019-01-25 14:49 ` Thomas Huth
2019-01-25 15:21 ` Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 02/52] ide: split ioport registration to a separate file Paolo Bonzini
2019-01-25 14:53 ` Thomas Huth
2019-01-25 15:22 ` Paolo Bonzini
2019-01-30 12:07 ` Thomas Huth
2019-01-30 12:20 ` Paolo Bonzini
2019-01-30 12:55 ` Yang Zhong
2019-01-30 15:55 ` BALATON Zoltan
2019-01-25 10:06 ` [Qemu-devel] [PATCH 03/52] vfio: move conditional up to hw/Makefile.objs Paolo Bonzini
2019-01-25 15:04 ` Thomas Huth
2019-01-25 10:06 ` [Qemu-devel] [PATCH 04/52] hw/pci-host/Makefile.objs: make CONFIGS clear for PCI EXPRESS Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 05/52] build: actually use CONFIG_PAM Paolo Bonzini
2019-01-31 21:50 ` Philippe Mathieu-Daudé
2019-01-25 10:06 ` [Qemu-devel] [PATCH 06/52] hw/i386/Makefile.objs: Build pc_piix* and pc_q35 boards Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 07/52] hw/arm/Makefile.objs: CONFIG_VIRT created for virt board Paolo Bonzini
2019-01-25 15:06 ` Thomas Huth
2019-01-25 15:23 ` Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 08/52] hw/m68k/Makefile.objs: Conditionally build boards Paolo Bonzini
2019-01-25 15:08 ` Thomas Huth
2019-01-25 10:06 ` [Qemu-devel] [PATCH 09/52] hw/microblaze/Makefile.objs: Create configs for petalogix and xilinx boards Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 10/52] hw/mips/Makefile.objs: Create CONFIG_* for r4k, malta, mipssim boards Paolo Bonzini
2019-01-31 21:50 ` Philippe Mathieu-Daudé
2019-01-25 10:06 ` [Qemu-devel] [PATCH 11/52] hw/ppc/Makefile.objs: Build all boards conditinally with CONFIG_* Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 12/52] hw/sh4/Makefile.objs: New CONFIG_* varibales created for sh4 boards and device Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 13/52] hw/s390/Makefile.objs: Create new CONFIG_* variables for s390x boards and devices Paolo Bonzini
2019-01-25 15:17 ` Thomas Huth
2019-01-25 15:23 ` Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 14/52] hw/sparc/Makefile.objs: CONFIG_* for sun4m and leon3 created Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 15/52] hw/lm32/Makefile.objs: Conditionally build lm32 and milkmyst Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 16/52] hw/xtensa/Makefile.objs: Build xtensa_sim and xtensa_fpga conditionally Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 17/52] hw/nios2/Makefile.objs: Conditionally build nios2 Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 18/52] hw/riscv/Makefile.objs: Create CONFIG_* for riscv boards Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 19/52] hw/sparc64/Makefile.objs: Create CONFIG_* for sparc64 Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 20/52] hw/alpha/Makefile.objs: Create CONFIG_* for alpha Paolo Bonzini
2019-01-25 15:29 ` Thomas Huth
2019-01-25 20:04 ` Richard Henderson
2019-01-25 10:06 ` [Qemu-devel] [PATCH 21/52] hw/cris/Makefile.objs: Create CONFIG_* for cris Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 22/52] hw/hppa/Makefile.objs: Create CONFIG_* for hppa Paolo Bonzini
2019-01-25 20:05 ` Richard Henderson
2019-01-25 10:06 ` [Qemu-devel] [PATCH 23/52] hw/moxie/Makefile.objs: Conditionally build moxie Paolo Bonzini
2019-01-25 15:33 ` Thomas Huth
2019-01-25 10:06 ` [Qemu-devel] [PATCH 24/52] hw/openrisc/Makefile.objs: Create CONFIG_* for openrisc Paolo Bonzini
2019-01-25 15:35 ` Thomas Huth
2019-01-25 17:33 ` Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 25/52] hw/tricore/Makefile.objs: Create CONFIG_* for tricore Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 26/52] hw/i2c/Makefile.objs: Create new CONFIG_* variables for EEPROM and ACPI controller Paolo Bonzini
2019-01-25 15:42 ` Thomas Huth
2019-01-25 10:06 ` [Qemu-devel] [PATCH 27/52] hw/vfio/Makefile.objs: Create new CONFIG_* variables for VFIO core and PCI Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 28/52] minikconfig: add parser skeleton Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 29/52] minikconfig: add AST Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 30/52] minikconfig: add semantic analysis Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 31/52] hw/display: make edid configurable Paolo Bonzini
2019-01-31 21:53 ` Philippe Mathieu-Daudé
2019-01-25 10:06 ` [Qemu-devel] [PATCH 32/52] kconfig: introduce kconfig files Paolo Bonzini
2019-01-31 13:21 ` Thomas Huth
2019-01-31 13:37 ` Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 33/52] build: switch to Kconfig Paolo Bonzini
2019-01-31 21:48 ` Philippe Mathieu-Daudé
2019-01-31 22:15 ` Paolo Bonzini
2019-02-01 14:56 ` Philippe Mathieu-Daudé
2019-02-01 21:24 ` Paolo Bonzini
2019-02-04 12:58 ` Paolo Bonzini
2019-02-04 15:45 ` Anthony PERARD
2019-02-04 19:04 ` Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 34/52] minikconf: implement allnoconfig and defconfig Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 35/52] ide: express dependencies with Kconfig Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 36/52] hw/pci/Makefile.objs: make pcie configurable Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 37/52] build: convert pci.mak to Kconfig Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 38/52] build: convert sound.mak " Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 39/52] build: convert usb.mak " Paolo Bonzini
2019-01-25 10:06 ` [Qemu-devel] [PATCH 40/52] scsi: express dependencies with Kconfig Paolo Bonzini
2019-01-31 21:23 ` Philippe Mathieu-Daudé
2019-01-31 22:11 ` Paolo Bonzini
2019-01-25 10:07 ` [Qemu-devel] [PATCH 41/52] isa: express dependencies with kconfig Paolo Bonzini
2019-01-30 10:53 ` Thomas Huth
2019-01-30 11:13 ` Paolo Bonzini
2019-01-30 11:32 ` Thomas Huth
2019-01-30 11:43 ` Paolo Bonzini
2019-01-30 11:58 ` Thomas Huth
2019-01-30 12:00 ` Yang Zhong
2019-01-31 21:22 ` Philippe Mathieu-Daudé
2019-01-31 22:14 ` Paolo Bonzini
2019-01-31 22:24 ` Philippe Mathieu-Daudé
2019-02-14 16:46 ` Paolo Bonzini
2019-01-25 10:07 ` [Qemu-devel] [PATCH 42/52] i386: express dependencies with Kconfig Paolo Bonzini
2019-01-28 14:21 ` Thomas Huth
2019-02-01 15:05 ` Philippe Mathieu-Daudé [this message]
2019-02-01 20:58 ` Paolo Bonzini
2019-02-14 16:47 ` Paolo Bonzini
2019-02-14 16:54 ` Michael S. Tsirkin
2019-02-14 17:02 ` Paolo Bonzini
2019-01-25 10:07 ` [Qemu-devel] [PATCH 43/52] i2c: " Paolo Bonzini
2019-01-31 22:10 ` Philippe Mathieu-Daudé
2019-01-31 22:21 ` Paolo Bonzini
2019-01-25 10:07 ` [Qemu-devel] [PATCH 44/52] ptimer: " Paolo Bonzini
2019-01-25 10:07 ` [Qemu-devel] [PATCH 45/52] display: express dependencies with kconfig Paolo Bonzini
2019-01-25 10:07 ` [Qemu-devel] [PATCH 46/52] hyperv: " Paolo Bonzini
2019-01-25 10:07 ` [Qemu-devel] [PATCH 47/52] vfio: express vfio dependencies with Kconfig Paolo Bonzini
2019-01-25 20:00 ` Alex Williamson
2019-01-28 10:54 ` Paolo Bonzini
2019-01-25 10:07 ` [Qemu-devel] [PATCH 48/52] virtio: express virtio " Paolo Bonzini
2019-01-25 10:07 ` [Qemu-devel] [PATCH 49/52] tpm: express " Paolo Bonzini
2019-01-25 10:07 ` [Qemu-devel] [PATCH 50/52] isa: express SuperIO " Paolo Bonzini
2019-01-31 21:26 ` Philippe Mathieu-Daudé
2019-01-25 10:07 ` [Qemu-devel] [PATCH 51/52] i386-softmmu.mak: remove all CONFIG_* except boards definitions Paolo Bonzini
2019-01-25 10:07 ` [Qemu-devel] [PATCH 52/52] kconfig: introduce CONFIG_TEST_DEVICES Paolo Bonzini
2019-01-25 11:07 ` [Qemu-devel] [RFC PATCH v5 00/52] Support Kconfig in QEMU Yang Zhong
2019-01-31 17:56 ` no-reply
2019-01-31 21:57 ` no-reply
2019-01-31 21:58 ` no-reply
2019-01-31 22:01 ` no-reply
2019-01-31 22:22 ` no-reply
2019-01-31 22:22 ` no-reply
2019-01-31 22:26 ` no-reply
2019-02-01 10:41 ` Philippe Mathieu-Daudé
2019-02-03 12:01 ` no-reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a67e6380-daf5-62d1-0f37-45f7015cc0fa@redhat.com \
--to=philmd@redhat.com \
--cc=kraxel@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
--cc=yang.zhong@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).