Re: [Qemu-trivial] [PATCH] hw/ide/ich: Compile ich.c only if CONFIG_PCI is also set

[Paolo Bonzini]

On 19/02/19 16:55, Thomas Huth wrote:
> With the upcoming Kconfig-like build system, it will be easy to
> build also version of QEMU that only contain a single machine. Some
> of these machines (like the ARM cubieboard) use CONFIG_AHCI for an
> AHCI sysbus device, but do not use CONFIG_PCI since they do not feature
> a PCI bus. In this case linking fails:
> 
> ../hw/ide/ich.o: In function `pci_ich9_ahci_realize':
> hw/ide/ich.c:124: undefined reference to `pci_allocate_irq'
> hw/ide/ich.c:126: undefined reference to `pci_register_bar'
> hw/ide/ich.c:128: undefined reference to `pci_register_bar'
> hw/ide/ich.c:131: undefined reference to `pci_add_capability'
> hw/ide/ich.c:147: undefined reference to `msi_init'
> ../hw/ide/ich.o: In function `pci_ich9_uninit':
> hw/ide/ich.c:158: undefined reference to `msi_uninit'
> ../hw/ide/ich.o:(.data.rel+0x50): undefined reference to `vmstate_pci_device'
> 
> Thus we must only compile ich.c if CONFIG_PCI is also set.
> 
> Signed-off-by: Thomas Huth <address@hidden>
> ---
>  hw/ide/Makefile.objs | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/ide/Makefile.objs b/hw/ide/Makefile.objs
> index a142add..dfe53af 100644
> --- a/hw/ide/Makefile.objs
> +++ b/hw/ide/Makefile.objs
> @@ -9,6 +9,6 @@ common-obj-$(CONFIG_IDE_MMIO) += mmio.o
>  common-obj-$(CONFIG_IDE_VIA) += via.o
>  common-obj-$(CONFIG_MICRODRIVE) += microdrive.o
>  common-obj-$(CONFIG_AHCI) += ahci.o
> -common-obj-$(CONFIG_AHCI) += ich.o
> +common-obj-$(call land,$(CONFIG_AHCI),$(CONFIG_PCI)) += ich.o
>  common-obj-$(CONFIG_ALLWINNER_A10) += ahci-allwinner.o
>  common-obj-$(CONFIG_IDE_SII3112) += sii3112.o

What about defining CONFIG_AHCI_ICH instead?  It can wait until after
Kconfig is merged.

Paolo