From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32796) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WLGrf-0001Bz-De for qemu-devel@nongnu.org; Wed, 05 Mar 2014 13:48:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WLGra-0003po-33 for qemu-devel@nongnu.org; Wed, 05 Mar 2014 13:48:23 -0500 Received: from cantor2.suse.de ([195.135.220.15]:58290 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WLGrZ-0003pZ-T6 for qemu-devel@nongnu.org; Wed, 05 Mar 2014 13:48:18 -0500 Message-ID: <5317716F.8040606@suse.de> Date: Wed, 05 Mar 2014 19:48:15 +0100 From: =?ISO-8859-1?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1393873716-9574-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> <5314D475.8070107@redhat.com> <87r46jvx99.fsf@linux.vnet.ibm.com> <20140303233652.GA12334@mail.hallyn.com> In-Reply-To: <20140303233652.GA12334@mail.hallyn.com> Content-Type: text/plain; charset=ISO-8859-1 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: "Aneesh Kumar K.V" Cc: Peter Maydell , Paolo Bonzini , Fam Zheng , qemu-devel@nongnu.org, "Serge E. Hallyn" Am 04.03.2014 00:36, schrieb Serge E. Hallyn: > Quoting Aneesh Kumar K.V (aneesh.kumar@linux.vnet.ibm.com): >> commit 01041f5df94ff19988cbadd7bd3eefcc9d964e4e >> Author: Aneesh Kumar K.V >> Date: Tue Mar 4 00:35:32 2014 +0530 >> >> hw/9pfs: Include virtio-9p-device.o in build >> =20 >> After commit ba1183da9a10b94611cad88c44a5c6df005f9b55 we are inclu= ding >> hw/Makefile.objs directly from Makefile.target. Make sure hw/Makef= ile.objs >> rules doesn't depend on variable defined in Makefile.objs >> =20 >> Signed-off-by: Aneesh Kumar K.V >=20 > Thanks, Aneesh, this worked for me. >=20 > Tested-by: Serge Hallyn Tested-by: Andreas F=E4rber Aneesh, could you please either properly submit a v2 so that Peter can apply it or send a pull to somehow fix this? Thanks, Andreas >=20 >> >> diff --git a/Makefile.objs b/Makefile.objs >> index 4a62913a4d25..5cd3d816ffb0 100644 >> --- a/Makefile.objs >> +++ b/Makefile.objs >> @@ -21,11 +21,6 @@ block-obj-y +=3D coroutine-$(CONFIG_COROUTINE_BACKE= ND).o >> =20 >> block-obj-m =3D block/ >> =20 >> -ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy) >> -# Lots of the fsdev/9pcode is pulled in by vl.c via qemu_fsdev_add. >> -# only pull in the actual virtio-9p device if we also enabled virtio. >> -CONFIG_REALLY_VIRTFS=3Dy >> -endif >> =20 >> #####################################################################= # >> # smartcard >> diff --git a/fsdev/Makefile.objs b/fsdev/Makefile.objs >> index 206289c49f18..c27dad3f6dc7 100644 >> --- a/fsdev/Makefile.objs >> +++ b/fsdev/Makefile.objs >> @@ -1,4 +1,6 @@ >> -ifeq ($(CONFIG_REALLY_VIRTFS),y) >> +ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy) >> +# Lots of the fsdev/9pcode is pulled in by vl.c via qemu_fsdev_add. >> +# only pull in the actual virtio-9p device if we also enabled virtio. >> common-obj-y =3D qemu-fsdev.o virtio-9p-marshal.o >> else >> common-obj-y =3D qemu-fsdev-dummy.o >> diff --git a/hw/Makefile.objs b/hw/Makefile.objs >> index 05a00dc40133..d178b65de4d0 100644 >> --- a/hw/Makefile.objs >> +++ b/hw/Makefile.objs >> @@ -1,4 +1,4 @@ >> -devices-dirs-$(CONFIG_REALLY_VIRTFS) +=3D 9pfs/ >> +devices-dirs-$(call land, $(CONFIG_VIRTIO),$(call land,$(CONFIG_VIRTF= S),$(CONFIG_PCI))) +=3D 9pfs/ >> devices-dirs-$(CONFIG_ACPI) +=3D acpi/ >> devices-dirs-$(CONFIG_SOFTMMU) +=3D audio/ >> devices-dirs-$(CONFIG_SOFTMMU) +=3D block/ --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg