diff options
| author | Yang Zhong <yang.zhong@intel.com> | 2019-01-23 14:56:14 +0800 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-03-07 21:45:53 +0100 |
| commit | ccf222a816d59af1318a7efb59c6b9c5578d1abf (patch) | |
| tree | 8da01102d57507dbb7fcc1c349372a2b19f568e4 | |
| parent | 32690c8bed5762518272876dcb6dd39a54f54fd1 (diff) | |
hyperv: express dependencies with kconfig
remove default-configs/hyperv.mak and make dependencies
with Kconfig.
Signed-off-by: Yang Zhong <yang.zhong@intel.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20190123065618.3520-41-yang.zhong@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | default-configs/hyperv.mak | 2 | ||||
| -rw-r--r-- | default-configs/i386-softmmu.mak | 1 | ||||
| -rw-r--r-- | hw/hyperv/Kconfig | 3 | ||||
| -rw-r--r-- | hw/i386/Kconfig | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/default-configs/hyperv.mak b/default-configs/hyperv.mak deleted file mode 100644 index 5d0d9fd830..0000000000 --- a/default-configs/hyperv.mak +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_HYPERV=$(CONFIG_KVM) -CONFIG_HYPERV_TESTDEV=y diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index 98552e1da5..c0826f558a 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -1,6 +1,5 @@ # Default configuration for i386-softmmu -include hyperv.mak CONFIG_VMXNET3_PCI=y CONFIG_VIRTIO_VGA=y CONFIG_IPMI=y diff --git a/hw/hyperv/Kconfig b/hw/hyperv/Kconfig index be724b7f8b..a1fa8ff9be 100644 --- a/hw/hyperv/Kconfig +++ b/hw/hyperv/Kconfig @@ -1,5 +1,8 @@ config HYPERV bool + depends on KVM config HYPERV_TESTDEV bool + default y if TEST_DEVICES + depends on HYPERV diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index a1a388371f..ea72f4888a 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -4,6 +4,7 @@ config SEV config PC bool + imply HYPERV imply QXL imply SEV imply TPM_CRB |