summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--default-configs/hyperv.mak2
-rw-r--r--default-configs/i386-softmmu.mak1
-rw-r--r--hw/hyperv/Kconfig3
-rw-r--r--hw/i386/Kconfig1
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