On 04/01/19 16:38, Thomas Huth wrote: > On 2018-12-27 07:34, Yang Zhong wrote: >> remove default-configs/hyperv.mak and make dependencies >> with Kconfig. >> >> Signed-off-by: Yang Zhong <yang.zh...@intel.com> >> --- >> default-configs/hyperv.mak | 2 -- >> default-configs/i386-softmmu.mak | 1 - >> hw/hyperv/Kconfig | 1 + >> hw/i386/Kconfig | 2 ++ >> 4 files changed, 3 insertions(+), 3 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 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 d2e58edd17..eb2d22de3c 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..632c3a675b 100644 >> --- a/hw/hyperv/Kconfig >> +++ b/hw/hyperv/Kconfig >> @@ -1,5 +1,6 @@ >> config HYPERV >> bool >> + depends on KVM >> >> config HYPERV_TESTDEV >> bool > > Should HYPERV_TESTDEV maybe get a "depends on HYPERV", too?
Yes, and also a "default y if PC". That makes the "select HYPERV_TESTDEV" unnecessary below. Paolo >> diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig >> index 695a67f88d..af4b81bae1 100644 >> --- a/hw/i386/Kconfig >> +++ b/hw/i386/Kconfig >> @@ -11,6 +11,8 @@ config PC >> select I8257 >> select MC146818RTC >> select TPM_TIS if TPM >> + select HYPERV >> + select HYPERV_TESTDEV >> >> config PC_PCI >> bool >> > > Reviewed-by: Thomas Huth <th...@redhat.com> >
