On 2019-01-15 15:10, Yang Zhong wrote:
> From: Paolo Bonzini <pbonzini@redhat.com>
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> default-configs/alpha-softmmu.mak | 2 --
> default-configs/pci.mak | 3 ---
> hw/ide/Kconfig | 15 +++++++++++++++
> 3 files changed, 15 insertions(+), 5 deletions(-)
>
> diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-softmmu.mak
> index 4d654eaa0b..62afa5ec16 100644
> --- a/default-configs/alpha-softmmu.mak
> +++ b/default-configs/alpha-softmmu.mak
> @@ -11,8 +11,6 @@ CONFIG_PARALLEL=y
> CONFIG_FDC=y
> CONFIG_PCKBD=y
> CONFIG_VGA_CIRRUS=y
> -CONFIG_IDE_CORE=y
> -CONFIG_IDE_QDEV=y
> CONFIG_VMWARE_VGA=y
> CONFIG_IDE_CMD646=y
> CONFIG_I8259=y
> 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..fe27705790 100644
> --- a/hw/ide/Kconfig
> +++ b/hw/ide/Kconfig
> @@ -3,33 +3,48 @@ 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_PCI
> + select IDE_QDEV
>
> config IDE_CMD646
> bool
> + select IDE_PCI
> + select IDE_QDEV
>
> config IDE_MACIO
> bool
> + select IDE_QDEV
>
> config IDE_MMIO
> bool
> + select IDE_QDEV
>
> config IDE_VIA
> bool
> + select IDE_PCI
> + select IDE_QDEV
>
> config MICRODRIVE
> bool
> + select IDE_QDEV
>
> config AHCI
> bool
> + select IDE_QDEV
>
> config IDE_SII3112
> bool
> + select IDE_PCI
> + select IDE_QDEV
>
Reviewed-by: Thomas Huth <thuth@redhat.com>