From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55020) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WLGQ8-0008O8-RY for qemu-devel@nongnu.org; Wed, 05 Mar 2014 13:20:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WLGQ3-000269-UE for qemu-devel@nongnu.org; Wed, 05 Mar 2014 13:19:56 -0500 Received: from mx1.redhat.com ([209.132.183.28]:20763) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WLGQ3-000256-LX for qemu-devel@nongnu.org; Wed, 05 Mar 2014 13:19:51 -0500 Message-ID: <53176AC0.3010901@redhat.com> Date: Wed, 05 Mar 2014 19:19:44 +0100 From: Paolo Bonzini MIME-Version: 1.0 References: <1393873716-9574-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> <5314D475.8070107@redhat.com> <531747BF.8020701@suse.de> In-Reply-To: <531747BF.8020701@suse.de> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH] hw/9pfs: Include virtio-9p-device.o in build List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?ISO-8859-1?Q?Andreas_F=E4rber?= Cc: Fam Zheng , "Aneesh Kumar K.V" , qemu-devel@nongnu.org Il 05/03/2014 16:50, Andreas F=E4rber 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" >>> >>> After commit ba1183da9a10b94611cad88c44a5c6df005f9b55 we are includin= g >>> hw/Makefile.objs directly from Makefile.target. Hence we need to defi= ne >>> the config in Makefile.target too to include virtio-9p-device.o in >>> the build >>> >>> Signed-off-by: Aneesh Kumar K.V >>> --- >>> 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 +=3D $(TRANSLATE_OPT_CFLAGS) >>> >>> +ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy) >>> +CONFIG_REALLY_VIRTFS=3Dy >>> +endif >>> + >>> dummy :=3D $(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=20 introduces between Makefile.objs and Makefile.target. Paolo