diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2019-01-23 14:56:01 +0800 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-03-07 21:45:53 +0100 |
commit | e0e312f3525ad6ac18ba6633af29190dd9620cbc (patch) | |
tree | c7de4268db87c6232d0efe943c615aab36b08135 /hw | |
parent | 82f5181777ebe04b550fd94a1d04c49dd3f012dc (diff) | |
download | qemu-e0e312f3525ad6ac18ba6633af29190dd9620cbc.zip qemu-e0e312f3525ad6ac18ba6633af29190dd9620cbc.tar.gz qemu-e0e312f3525ad6ac18ba6633af29190dd9620cbc.tar.bz2 |
build: switch to Kconfig
The make_device_config.sh script is replaced by minikconf, which
is modified to support the same command line as its predecessor.
The roots of the parsing are default-configs/*.mak, Kconfig.host and
hw/Kconfig. One difference with make_device_config.sh is that all symbols
have to be defined in a Kconfig file, including those coming from the
configure script. This is the reason for the Kconfig.host file introduced
in the previous patch. Whenever a file in default-configs/*.mak used
$(...) to refer to a config-host.mak symbol, this is replaced by a
Kconfig dependency; this part must be done already in this patch
for bisectability.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Yang Zhong <yang.zhong@intel.com>
Acked-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20190123065618.3520-28-yang.zhong@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw')
-rw-r--r-- | hw/9pfs/Kconfig | 2 | ||||
-rw-r--r-- | hw/arm/Kconfig | 1 | ||||
-rw-r--r-- | hw/block/Kconfig | 2 | ||||
-rw-r--r-- | hw/display/Kconfig | 3 | ||||
-rw-r--r-- | hw/i386/Kconfig | 8 | ||||
-rw-r--r-- | hw/input/Kconfig | 5 | ||||
-rw-r--r-- | hw/intc/Kconfig | 12 | ||||
-rw-r--r-- | hw/misc/Kconfig | 2 | ||||
-rw-r--r-- | hw/ppc/Kconfig | 4 | ||||
-rw-r--r-- | hw/scsi/Kconfig | 7 | ||||
-rw-r--r-- | hw/tpm/Kconfig | 2 | ||||
-rw-r--r-- | hw/vfio/Kconfig | 9 | ||||
-rw-r--r-- | hw/xtensa/Kconfig | 2 |
13 files changed, 58 insertions, 1 deletions
diff --git a/hw/9pfs/Kconfig b/hw/9pfs/Kconfig index a475099..c9e244f 100644 --- a/hw/9pfs/Kconfig +++ b/hw/9pfs/Kconfig @@ -1,2 +1,4 @@ config VIRTIO_9P bool + default y + depends on VIRTFS diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index e4386ce..9eab67b 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -1,5 +1,6 @@ config ARM_VIRT bool + imply VFIO_PLATFORM config DIGIC bool diff --git a/hw/block/Kconfig b/hw/block/Kconfig index 9d418bc..65431c4 100644 --- a/hw/block/Kconfig +++ b/hw/block/Kconfig @@ -27,3 +27,5 @@ config VIRTIO_BLK config VHOST_USER_BLK bool + default y + depends on VHOST_USER && LINUX diff --git a/hw/display/Kconfig b/hw/display/Kconfig index d5c022c..1149ea2 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -51,6 +51,8 @@ config FRAMEBUFFER config MILKYMIST_TMU2 bool + default y + depends on OPENGL && X11 config SM501 bool @@ -66,6 +68,7 @@ config VGA config QXL bool + depends on SPICE && PCI config VIRTIO_GPU bool diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index c851e2b..307a804 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -1,5 +1,13 @@ config SEV bool + depends on KVM + +config PC + bool + imply QXL + imply SEV + imply TPM_CRB + imply TPM_TIS config I440FX bool diff --git a/hw/input/Kconfig b/hw/input/Kconfig index 91bae47..c729dcd 100644 --- a/hw/input/Kconfig +++ b/hw/input/Kconfig @@ -19,5 +19,10 @@ config TSC2005 config VIRTIO_INPUT bool +config VIRTIO_INPUT_HOST + bool + default y + depends on LINUX + config TSC210X bool diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig index 69adbd1..6eea14e 100644 --- a/hw/intc/Kconfig +++ b/hw/intc/Kconfig @@ -21,18 +21,28 @@ config APIC config ARM_GIC_KVM bool + default y + depends on ARM_GIC && KVM config OPENPIC_KVM bool + default y + depends on OPENPIC && KVM config XICS bool + default y + depends on PSERIES config XICS_SPAPR bool + default y + depends on PSERIES config XICS_KVM bool + default y + depends on XICS && KVM config ALLWINNER_A10_PIC bool @@ -42,6 +52,8 @@ config S390_FLIC config S390_FLIC_KVM bool + default y + depends on S390_FLIC && KVM config OMPIC bool diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index d512634..fc068ef 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -48,6 +48,8 @@ config MACIO config IVSHMEM_DEVICE bool + default y + depends on PCI && LINUX && IVSHMEM config ECCMEMCTL bool diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index 6087454..fb085d7 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -39,6 +39,10 @@ config VIRTEX config XIVE bool + default y + depends on PSERIES config XIVE_SPAPR bool + default y + depends on PSERIES diff --git a/hw/scsi/Kconfig b/hw/scsi/Kconfig index eb78478..a3518a3 100644 --- a/hw/scsi/Kconfig +++ b/hw/scsi/Kconfig @@ -19,8 +19,15 @@ config ESP config ESP_PCI bool +config SPAPR_VSCSI + bool + default y + depends on PSERIES + config VIRTIO_SCSI bool config VHOST_USER_SCSI bool + default y + depends on VHOST_USER && LINUX diff --git a/hw/tpm/Kconfig b/hw/tpm/Kconfig index 2eee8eb..b5d1724f 100644 --- a/hw/tpm/Kconfig +++ b/hw/tpm/Kconfig @@ -3,9 +3,11 @@ config TPM config TPM_TIS bool + depends on TPM config TPM_CRB bool + depends on TPM config TPM_PASSTHROUGH bool diff --git a/hw/vfio/Kconfig b/hw/vfio/Kconfig index 3606967..0fdff10 100644 --- a/hw/vfio/Kconfig +++ b/hw/vfio/Kconfig @@ -1,14 +1,21 @@ config VFIO bool + depends on LINUX config VFIO_PCI bool + select VFIO + depends on LINUX config VFIO_CCW bool + select VFIO + depends on LINUX config VFIO_PLATFORM bool + select VFIO + depends on LINUX config VFIO_XGMAC bool @@ -18,3 +25,5 @@ config VFIO_AMD_XGBE config VFIO_AP bool + select VFIO + depends on LINUX diff --git a/hw/xtensa/Kconfig b/hw/xtensa/Kconfig index 97543a9..dc8eaf6 100644 --- a/hw/xtensa/Kconfig +++ b/hw/xtensa/Kconfig @@ -1,5 +1,5 @@ config XTENSA_SIM bool -config XTENSA_FPGA +config XTENSA_XTFPGA bool |