Re: [Qemu-devel] [PATCH] hw/9pfs: Include virtio-9p-device.o in build

[Paolo Bonzini <pbonzini@redhat.com>]

Il 03/03/2014 20:08, Aneesh Kumar K.V ha scritto:
> From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
>
> After commit ba1183da9a10b94611cad88c44a5c6df005f9b55 we are including
> hw/Makefile.objs directly from Makefile.target. Hence we need to define
> the config in Makefile.target too to include virtio-9p-device.o in
> the build
>
> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
> ---
>  Makefile.target | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/Makefile.target b/Makefile.target
> index ba1234063eae..da8daa82c39e 100644
> --- a/Makefile.target
> +++ b/Makefile.target
> @@ -137,6 +137,10 @@ endif # CONFIG_SOFTMMU
>  # Workaround for http://gcc.gnu.org/PR55489, see configure.
>  %/translate.o: QEMU_CFLAGS += $(TRANSLATE_OPT_CFLAGS)
>
> +ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy)
> +CONFIG_REALLY_VIRTFS=y
> +endif
> +
>  dummy := $(call unnest-vars,,obj-y)
>
>  # we are making another call to unnest-vars with different vars, protect obj-y,
>

Can you just replace $(CONFIG_REALLY_VIRTFS) with

$(call land, $(call land, $(CONFIG_VIRTIO),
                           $(CONFIG_VIRTFS)),
                           $(CONFIG_PCI))

in hw/Makefile.objs, and remove it from Makefile.objs?

Paolo