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

[Paolo Bonzini]

Il 05/03/2014 16:50, Andreas Färber ha scritto:
> Am 03.03.2014 20:13, schrieb Paolo Bonzini:
> > Il 03/03/2014 20:08, Aneesh Kumar K.V ha scritto:
> > > From: "Aneesh Kumar K.V" <address@hidden>
> > >
> > > 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 <address@hidden>
> > > ---
> > >  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?
>
> Is your trouble with the "REALLY" in there? I've been working on a
> virtio-9p qtest, which was able to reuse $(CONFIG_REALLY_VIRTFS) before;
> now I need to copy the full ifeq() expression.

No, the trouble is more with the code duplication that the patch 
introduces between Makefile.objs and Makefile.target.

Paolo