diff mbox series

[RFC,09/25] ide: express dependencies with Kconfig

Message ID 20181227063419.12981-10-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 
From: Paolo Bonzini <pbonzini@redhat.com>

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 default-configs/pci.mak |  3 ---
 hw/ide/Kconfig          | 11 +++++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

Comments

Thomas Huth Jan. 3, 2019, 3:47 p.m. UTC | #1 
On 2018-12-27 07:34, Yang Zhong wrote:
> From: Paolo Bonzini <pbonzini@redhat.com>
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
[...]
> diff --git a/hw/ide/Kconfig b/hw/ide/Kconfig
> index 5ec449525f..091f3a81c9 100644
> --- a/hw/ide/Kconfig
> +++ b/hw/ide/Kconfig
> @@ -3,33 +3,44 @@ config IDE_CORE
>  
>  config IDE_QDEV
>      bool
> +    select IDE_CORE
>  
>  config IDE_PCI
>      bool
> +    select IDE_CORE
>  
>  config IDE_ISA
>      bool
> +    select IDE_QDEV
>  
>  config IDE_PIIX
>      bool
> +    select IDE_QDEV
>  
>  config IDE_CMD646
>      bool
> +    select IDE_QDEV

PIIX and CMD646 seem to be derived from TYPE_PCI_IDE, so shouldn't these
switches rather select IDE_PCI instead? (Or depend on IDE_PCI?)

>  config IDE_MACIO
>      bool
> +    select IDE_QDEV
>  
>  config IDE_MMIO
>      bool
> +    select IDE_QDEV
>  
>  config IDE_VIA
>      bool
> +    select IDE_QDEV

dito, VIA is a PCI device, too.

>  config MICRODRIVE
>      bool
> +    select IDE_QDEV
>  
>  config AHCI
>      bool
> +    select IDE_QDEV
>  
>  config IDE_SII3112
>      bool
> +    select IDE_QDEV
> 

dito, SII3112 is a PCI device.

 Thomas
Yang Zhong Jan. 8, 2019, 5:22 a.m. UTC | #2 
On Thu, Jan 03, 2019 at 04:47:02PM +0100, Thomas Huth wrote:
> On 2018-12-27 07:34, Yang Zhong wrote:
> > From: Paolo Bonzini <pbonzini@redhat.com>
> > 
> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> > ---
> [...]
> > diff --git a/hw/ide/Kconfig b/hw/ide/Kconfig
> > index 5ec449525f..091f3a81c9 100644
> > --- a/hw/ide/Kconfig
> > +++ b/hw/ide/Kconfig
> > @@ -3,33 +3,44 @@ config IDE_CORE
> >  
> >  config IDE_QDEV
> >      bool
> > +    select IDE_CORE
> >  
> >  config IDE_PCI
> >      bool
> > +    select IDE_CORE
> >  
> >  config IDE_ISA
> >      bool
> > +    select IDE_QDEV
> >  
> >  config IDE_PIIX
> >      bool
> > +    select IDE_QDEV
> >  
> >  config IDE_CMD646
> >      bool
> > +    select IDE_QDEV
> 
> PIIX and CMD646 seem to be derived from TYPE_PCI_IDE, so shouldn't these
> switches rather select IDE_PCI instead? (Or depend on IDE_PCI?)
> 
  Hello Thomas,

  Thanks, you are right. The CONFIG_IDE_PCI=y was removed in this patch,
  so the "select IDE_PCI" should be added here from next patch(convert 
  pci.mak to Kconfig patch). thanks!

  Regards,

  Yang  


> >  config IDE_MACIO
> >      bool
> > +    select IDE_QDEV
> >  
> >  config IDE_MMIO
> >      bool
> > +    select IDE_QDEV
> >  
> >  config IDE_VIA
> >      bool
> > +    select IDE_QDEV
> 
> dito, VIA is a PCI device, too.
> 
  Yes, you are right, i will change this like above. thanks!

  Regards,

  Yang

> >  config MICRODRIVE
> >      bool
> > +    select IDE_QDEV
> >  
> >  config AHCI
> >      bool
> > +    select IDE_QDEV
> >  
> >  config IDE_SII3112
> >      bool
> > +    select IDE_QDEV
> > 
> 
> dito, SII3112 is a PCI device.
> 
>  Thomas

  Yes, thanks for reminder!
  I will add "depends on PCI" in next patches(convert pci.mak to 
  Kconfig patch), thanks

  Regards,

  Yang
diff mbox series

Patch

diff --git a/default-configs/pci.mak b/default-configs/pci.mak
index 171bdf48bc..c1b64922b9 100644
--- a/default-configs/pci.mak
+++ b/default-configs/pci.mak
@@ -23,9 +23,6 @@  CONFIG_MPTSAS_SCSI_PCI=y
 CONFIG_RTL8139_PCI=y
 CONFIG_E1000_PCI=y
 CONFIG_E1000E_PCI=y
-CONFIG_IDE_CORE=y
-CONFIG_IDE_QDEV=y
-CONFIG_IDE_PCI=y
 CONFIG_AHCI=y
 CONFIG_ESP=y
 CONFIG_ESP_PCI=y
diff --git a/hw/ide/Kconfig b/hw/ide/Kconfig
index 5ec449525f..091f3a81c9 100644
--- a/hw/ide/Kconfig
+++ b/hw/ide/Kconfig
@@ -3,33 +3,44 @@  config IDE_CORE
 
 config IDE_QDEV
     bool
+    select IDE_CORE
 
 config IDE_PCI
     bool
+    select IDE_CORE
 
 config IDE_ISA
     bool
+    select IDE_QDEV
 
 config IDE_PIIX
     bool
+    select IDE_QDEV
 
 config IDE_CMD646
     bool
+    select IDE_QDEV
 
 config IDE_MACIO
     bool
+    select IDE_QDEV
 
 config IDE_MMIO
     bool
+    select IDE_QDEV
 
 config IDE_VIA
     bool
+    select IDE_QDEV
 
 config MICRODRIVE
     bool
+    select IDE_QDEV
 
 config AHCI
     bool
+    select IDE_QDEV
 
 config IDE_SII3112
     bool
+    select IDE_QDEV