diff mbox series

[RFC,20/25] hyperv: express dependencies with kconfig

Message ID 20181227063419.12981-21-yang.zhong@intel.com (mailing list archive)
State New, archived
Headers show
Series Support Kconfig in QEMU | expand

Commit Message

Yang Zhong Dec. 27, 2018, 6:34 a.m. UTC 
remove default-configs/hyperv.mak and make dependencies
with Kconfig.

Signed-off-by: Yang Zhong <yang.zhong@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

Comments

Thomas Huth Jan. 4, 2019, 3:38 p.m. UTC | #1 
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.zhong@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?

> 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 <thuth@redhat.com>
Paolo Bonzini Jan. 4, 2019, 7:50 p.m. UTC | #2 
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.zhong@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 <thuth@redhat.com>
>
Yang Zhong Jan. 8, 2019, 10:35 a.m. UTC | #3 
On Fri, Jan 04, 2019 at 04:38:34PM +0100, 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.zhong@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/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?
> 
  Thomas, thanks, i will change it.  
  
  Regards,

  Yang 
 
> > 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 <thuth@redhat.com>
Yang Zhong Jan. 8, 2019, 10:38 a.m. UTC | #4 
On Fri, Jan 04, 2019 at 08:50:23PM +0100, Paolo Bonzini wrote:
> 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.zhong@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

  Thanks Paolo, i will also add this.

  Regards,

  Yang
> 
> >> 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 <thuth@redhat.com>
> >
diff mbox series

Patch

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
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