Message ID | 20190118112410.3010-42-yang.zhong@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | Support Kconfig in QEMU | expand |
On 18/01/19 12:24, Yang Zhong wrote: > config ACPI_NVDIMM > bool > + default y > + depends on I440FX || Q35 This is "depends on PC". > config ACPI_VMGENID > bool > + default y > + depends on I440FX || Q35 > > config IPMI > bool IPMI should have a "depends on PC" too. Paolo
On 2019-01-18 16:28, Paolo Bonzini wrote: > On 18/01/19 12:24, Yang Zhong wrote: >> config ACPI_NVDIMM >> bool >> + default y >> + depends on I440FX || Q35 > > This is "depends on PC". > >> config ACPI_VMGENID >> bool >> + default y >> + depends on I440FX || Q35 >> >> config IPMI >> bool > > IPMI should have a "depends on PC" too. config ISAPC selects PC, too, and I don't think that ISAPC has ACPI, has it? Thomas
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index 992aea8f30..7b083412af 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -1,27 +1,5 @@ # Default configuration for i386-softmmu -CONFIG_VMXNET3_PCI=y -CONFIG_IPMI=y -CONFIG_IPMI_LOCAL=y -CONFIG_IPMI_EXTERN=y -CONFIG_ISA_IPMI_KCS=y -CONFIG_ISA_IPMI_BT=y - -# Optional devices: -# -CONFIG_HPET=y -CONFIG_APPLESMC=y -CONFIG_PFLASH_CFI01=y -CONFIG_ISA_TESTDEV=y -CONFIG_SGA=y -CONFIG_PVPANIC=y -CONFIG_MEM_DEVICE=y -CONFIG_NVDIMM=y -CONFIG_ACPI_NVDIMM=y -CONFIG_PXB=y -CONFIG_ACPI_VMGENID=y -CONFIG_SEV=$(CONFIG_KVM) - # Boards: # CONFIG_ISAPC=y diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig index 98bb3539e1..61c456bcc9 100644 --- a/hw/acpi/Kconfig +++ b/hw/acpi/Kconfig @@ -18,9 +18,13 @@ config ACPI_MEMORY_HOTPLUG config ACPI_NVDIMM bool + default y + depends on I440FX || Q35 config ACPI_VMGENID bool + default y + depends on I440FX || Q35 config IPMI bool diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index 9f5788e8e2..1bda20f315 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -1,6 +1,10 @@ config KVM bool +config SEV + bool + default y if PC && KVM + config PC bool select ISA_DEBUG @@ -25,6 +29,7 @@ config PC_ACPI select ACPI_CPU_HOTPLUG select ACPI_MEMORY_HOTPLUG select SMBUS_EEPROM + select PFLASH_CFI01 depends on ACPI_SMBUS config I440FX diff --git a/hw/ipmi/Kconfig b/hw/ipmi/Kconfig index 68f8ba1a54..b15c7b3edc 100644 --- a/hw/ipmi/Kconfig +++ b/hw/ipmi/Kconfig @@ -3,12 +3,20 @@ config IPMI config IPMI_LOCAL bool + default y + depends on IPMI config IPMI_EXTERN bool + default y + depends on IPMI config ISA_IPMI_KCS bool + default y if PC + select IPMI config ISA_IPMI_BT bool + default y if PC + select IPMI diff --git a/hw/mem/Kconfig b/hw/mem/Kconfig index a3a4372fa7..ff96dc8573 100644 --- a/hw/mem/Kconfig +++ b/hw/mem/Kconfig @@ -6,3 +6,5 @@ config MEM_DEVICE config NVDIMM bool + default y + depends on I440FX || Q35 diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index 73ceefab75..6fb1c0ca22 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -1,5 +1,6 @@ config APPLESMC bool + default y if PC depends on ISA_BUS config MAX111X @@ -19,10 +20,12 @@ config ISA_DEBUG config SGA bool + default y if PC depends on ISA_BUS config ISA_TESTDEV bool + default y if PC config PCI_TESTDEV bool @@ -99,6 +102,7 @@ config IOTKIT_SYSINFO config PVPANIC bool + default y if PC depends on ISA_BUS config AUX diff --git a/hw/pci-bridge/Kconfig b/hw/pci-bridge/Kconfig index d54d878023..7865e182dc 100644 --- a/hw/pci-bridge/Kconfig +++ b/hw/pci-bridge/Kconfig @@ -5,6 +5,7 @@ config PCIE_PORT config PXB bool + default y if PC config XIO3130 bool diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig index a021c742de..51921eb63f 100644 --- a/hw/timer/Kconfig +++ b/hw/timer/Kconfig @@ -15,6 +15,7 @@ config DS1338 config HPET bool + default y if PC config I8254 bool
%-softmmu.mak only keep boards definitions in Kconfig mode. Signed-off-by: Yang Zhong <yang.zhong@intel.com> --- default-configs/i386-softmmu.mak | 22 ---------------------- hw/acpi/Kconfig | 4 ++++ hw/i386/Kconfig | 5 +++++ hw/ipmi/Kconfig | 8 ++++++++ hw/mem/Kconfig | 2 ++ hw/misc/Kconfig | 4 ++++ hw/pci-bridge/Kconfig | 1 + hw/timer/Kconfig | 1 + 8 files changed, 25 insertions(+), 22 deletions(-)