From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47069) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WLwVv-0004gr-C3 for qemu-devel@nongnu.org; Fri, 07 Mar 2014 10:16:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WLwVk-00053B-2L for qemu-devel@nongnu.org; Fri, 07 Mar 2014 10:16:43 -0500 Received: from e28smtp06.in.ibm.com ([122.248.162.6]:40991) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WLwVj-00052U-Cr for qemu-devel@nongnu.org; Fri, 07 Mar 2014 10:16:31 -0500 Received: from /spool/local by e28smtp06.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 7 Mar 2014 20:46:29 +0530 Received: from d28relay01.in.ibm.com (d28relay01.in.ibm.com [9.184.220.58]) by d28dlp03.in.ibm.com (Postfix) with ESMTP id 2290A1258048 for ; Fri, 7 Mar 2014 20:48:38 +0530 (IST) Received: from d28av03.in.ibm.com (d28av03.in.ibm.com [9.184.220.65]) by d28relay01.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s27FGIpg40370238 for ; Fri, 7 Mar 2014 20:46:18 +0530 Received: from d28av03.in.ibm.com (localhost [127.0.0.1]) by d28av03.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s27FGPgp017229 for ; Fri, 7 Mar 2014 20:46:26 +0530 From: "Aneesh Kumar K.V" Date: Fri, 7 Mar 2014 20:46:20 +0530 Message-Id: <1394205380-31875-6-git-send-email-aneesh.kumar@linux.vnet.ibm.com> In-Reply-To: <1394205380-31875-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> References: <1394205380-31875-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 5/5] hw/9pfs: Include virtio-9p-device.o in build List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws, peter.maydell@linaro.org Cc: qemu-devel@nongnu.org, "Aneesh Kumar K.V" From: "Aneesh Kumar K.V" After commit ba1183da9a10b94611cad88c44a5c6df005f9b55 we are including hw/Makefile.objs directly from Makefile.target. Make sure hw/Makefile.objs rules doesn't depend on variable defined in Makefile.objs Tested-by: Serge Hallyn Signed-off-by: Aneesh Kumar K.V --- Makefile.objs | 5 ----- fsdev/Makefile.objs | 4 +++- hw/Makefile.objs | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) 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 += coroutine-$(CONFIG_COROUTINE_BACKEND).o block-obj-m = block/ -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=y -endif ###################################################################### # 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 = qemu-fsdev.o virtio-9p-marshal.o else common-obj-y = 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) += 9pfs/ +devices-dirs-$(call land, $(CONFIG_VIRTIO),$(call land,$(CONFIG_VIRTFS),$(CONFIG_PCI))) += 9pfs/ devices-dirs-$(CONFIG_ACPI) += acpi/ devices-dirs-$(CONFIG_SOFTMMU) += audio/ devices-dirs-$(CONFIG_SOFTMMU) += block/ -- 1.8.3.2