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>

diff --git a/default-configs/hyperv.mak b/default-configs/hyperv.mak
deleted file mode 100644 (file)
index 5d0d9fd..0000000
--- 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 98552e1da567b660525c2c91835d30342df8e78d..c0826f558a11b33d953433ab30604121c74ab578 100644 (file)
--- 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 be724b7f8bcb903ce8d7da7cf85e49cecd4d83b7..a1fa8ff9becc5739fb7da20a90ea789134fd4abc 100644 (file)
--- 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 a1a388371fab8d574b826edc3bf8a8a5ff605d49..ea72f4888a6fdd4d7f0a983896407dc41b2a79a1 100644 (file)
--- 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