From: Yang Zhong <yang.zh...@intel.com>
remove default-configs/hyperv.mak and make dependencies
with Kconfig.
Signed-off-by: Yang Zhong <yang.zh...@intel.com>
Reviewed-by: Thomas Huth <th...@redhat.com>
Message-Id: <20190123065618.3520-41-yang.zh...@intel.com>
Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
---
default-configs/hyperv.mak | 1 -
default-configs/i386-softmmu.mak | 1 -
hw/hyperv/Kconfig | 2 ++
3 files changed, 2 insertions(+), 2 deletions(-)
delete mode 100644 default-configs/hyperv.mak
diff --git a/default-configs/hyperv.mak b/default-configs/hyperv.mak
deleted file mode 100644
index bc38061..0000000
--- a/default-configs/hyperv.mak
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HYPERV_TESTDEV=y
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
index 98552e1..c0826f5 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 632c3a6..a1fa8ff 100644
--- a/hw/hyperv/Kconfig
+++ b/hw/hyperv/Kconfig
@@ -4,3 +4,5 @@ config HYPERV
config HYPERV_TESTDEV
bool
+ default y if TEST_DEVICES
+ depends on HYPERV
--
1.8.3.1
