Re: [Qemu-devel] [PATCH 1/2] Makefile: do not repeat $(CONFIG_SOFTMMU) in hw/Makefile.objs

[Markus Armbruster]

Paolo Bonzini <address@hidden> writes:

> The device directories must be included only for softmmu builds.
> Instead of repeating $(CONFIG_SOFTMMU), use an "ifeq".
>
> Signed-off-by: Paolo Bonzini <address@hidden>
> ---
>  hw/Makefile.objs | 61 
> +++++++++++++++++++++++++++++---------------------------
>  1 file changed, 32 insertions(+), 29 deletions(-)
>
> diff --git a/hw/Makefile.objs b/hw/Makefile.objs
> index d770926..ece6cc3 100644
> --- a/hw/Makefile.objs
> +++ b/hw/Makefile.objs
> @@ -1,42 +1,45 @@
> +devices-dirs-y = core/
> +ifeq ($(CONFIG_SOFTMMU), y)
>  devices-dirs-$(call lor,$(CONFIG_VIRTIO_9P),$(call 
> land,$(CONFIG_VIRTFS),$(CONFIG_XEN))) += 9pfs/
> -devices-dirs-$(CONFIG_SOFTMMU) += acpi/
> -devices-dirs-$(CONFIG_SOFTMMU) += adc/
> -devices-dirs-$(CONFIG_SOFTMMU) += audio/
> -devices-dirs-$(CONFIG_SOFTMMU) += block/
> -devices-dirs-$(CONFIG_SOFTMMU) += bt/
> -devices-dirs-$(CONFIG_SOFTMMU) += char/
> -devices-dirs-$(CONFIG_SOFTMMU) += cpu/
> -devices-dirs-$(CONFIG_SOFTMMU) += display/
> -devices-dirs-$(CONFIG_SOFTMMU) += dma/
> -devices-dirs-$(CONFIG_SOFTMMU) += gpio/
> +devices-dirs-y += acpi/
> +devices-dirs-y += adc/
> +devices-dirs-y += audio/
> +devices-dirs-y += block/
> +devices-dirs-y += bt/
> +devices-dirs-y += char/
> +devices-dirs-y += cpu/
> +devices-dirs-y += display/
> +devices-dirs-y += dma/
> +devices-dirs-y += gpio/
>  devices-dirs-$(CONFIG_HYPERV) += hyperv/
>  devices-dirs-$(CONFIG_I2C) += i2c/
> -devices-dirs-$(CONFIG_SOFTMMU) += ide/
> -devices-dirs-$(CONFIG_SOFTMMU) += input/
> -devices-dirs-$(CONFIG_SOFTMMU) += intc/
> +devices-dirs-y += ide/
> +devices-dirs-y += input/
> +devices-dirs-y += intc/
>  devices-dirs-$(CONFIG_IPACK) += ipack/
>  devices-dirs-$(CONFIG_IPMI) += ipmi/
> -devices-dirs-$(CONFIG_SOFTMMU) += isa/
> -devices-dirs-$(CONFIG_SOFTMMU) += misc/
> -devices-dirs-$(CONFIG_SOFTMMU) += net/
> -devices-dirs-$(CONFIG_SOFTMMU) += rdma/
> -devices-dirs-$(CONFIG_SOFTMMU) += nvram/
> -devices-dirs-$(CONFIG_SOFTMMU) += pci/
> +devices-dirs-y += isa/
> +devices-dirs-y += misc/
> +devices-dirs-y += net/
> +devices-dirs-y += rdma/
> +devices-dirs-y += nvram/
> +devices-dirs-y += pci/
>  devices-dirs-$(CONFIG_PCI) += pci-bridge/ pci-host/
> -devices-dirs-$(CONFIG_SOFTMMU) += pcmcia/
> +devices-dirs-y += pcmcia/
>  devices-dirs-$(CONFIG_SCSI) += scsi/
> -devices-dirs-$(CONFIG_SOFTMMU) += sd/
> -devices-dirs-$(CONFIG_SOFTMMU) += ssi/
> -devices-dirs-$(CONFIG_SOFTMMU) += timer/
> +devices-dirs-y += sd/
> +devices-dirs-y += ssi/
> +devices-dirs-y += timer/
>  devices-dirs-$(CONFIG_TPM) += tpm/
> -devices-dirs-$(CONFIG_SOFTMMU) += usb/
> +devices-dirs-y += usb/
>  devices-dirs-$(CONFIG_VFIO) += vfio/
> -devices-dirs-$(CONFIG_SOFTMMU) += virtio/
> -devices-dirs-$(CONFIG_SOFTMMU) += watchdog/
> -devices-dirs-$(CONFIG_SOFTMMU) += xen/
> +devices-dirs-y += virtio/
> +devices-dirs-y += watchdog/
> +devices-dirs-y += xen/
>  devices-dirs-$(CONFIG_MEM_DEVICE) += mem/
> -devices-dirs-$(CONFIG_SOFTMMU) += smbios/
>  devices-dirs-y += semihosting/

This one is now conditional on CONFIG_SOFTMMU.  Intentional?

> -devices-dirs-y += core/
> +devices-dirs-y += smbios/
> +endif
> +
>  common-obj-y += $(devices-dirs-y)
>  obj-y += $(devices-dirs-y)