From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:52423) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RvegI-0002ZF-U9 for qemu-devel@nongnu.org; Thu, 09 Feb 2012 19:49:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RvegH-0004mk-Ln for qemu-devel@nongnu.org; Thu, 09 Feb 2012 19:49:42 -0500 Received: from relay1.mentorg.com ([192.94.38.131]:32949) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RvegH-0004mg-F5 for qemu-devel@nongnu.org; Thu, 09 Feb 2012 19:49:41 -0500 Message-ID: <4F3469A1.6090304@codesourcery.com> Date: Thu, 9 Feb 2012 18:49:37 -0600 From: Meador Inge MIME-Version: 1.0 References: <1328647446-5452-1-git-send-email-meadori@codesourcery.com> <1328647446-5452-2-git-send-email-meadori@codesourcery.com> In-Reply-To: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v1 1/1] ./configure: add option for disabling VirtFS List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: aliguori@us.ibm.com, qemu-devel@nongnu.org, aneesh.kumar@linux.vnet.ibm.com On 02/09/2012 04:39 PM, Peter Maydell wrote: > On 7 February 2012 20:44, Meador Inge wrote: >> Signed-off-by: Meador Inge >> --- >> Makefile | 4 ++++ >> configure | 16 +++++++++++++--- >> 2 files changed, 17 insertions(+), 3 deletions(-) >> >> diff --git a/Makefile b/Makefile >> index 47acf3d..030619c 100644 >> --- a/Makefile >> +++ b/Makefile >> @@ -40,7 +40,9 @@ HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF) >> >> ifdef BUILD_DOCS >> DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 QMP/qmp-commands.txt >> +ifdef CONFIG_VIRTFS >> DOCS+=fsdev/virtfs-proxy-helper.1 >> +endif >> else >> DOCS= >> endif >> @@ -162,8 +164,10 @@ qemu-io$(EXESUF): qemu-io.o cmd.o $(tools-obj-y) $(block-obj-y) >> >> qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o >> >> +ifdef CONFIG_VIRTFS >> fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/virtio-9p-marshal.o oslib-posix.o $(trace-obj-y) >> fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap >> +endif > > We don't need to make this conditional, we will just not put > the proxy-helper into TOOLS if we don't want to build it and > this dependency will be ignored. Fixed. >> qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx >> $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@," GEN $@") >> diff --git a/configure b/configure >> index 763db24..081d720 100755 >> --- a/configure >> +++ b/configure >> @@ -121,6 +121,7 @@ docs="" >> fdt="" >> nptl="" >> sdl="" >> +virtfs="yes" >> vnc="yes" >> sparse="no" >> uuid="" >> @@ -586,6 +587,10 @@ for opt do >> ;; >> --enable-sdl) sdl="yes" >> ;; >> + --disable-virtfs) virtfs="no" >> + ;; >> + --enable-virtfs) virtfs="yes" >> + ;; >> --disable-vnc) vnc="no" >> ;; >> --enable-vnc) vnc="yes" > > This should be handled the same way as a number of other optional > components : default is "" meaning 'probe and use if possible'. > So you end up with a test like: > > if test "$virtfs" != no; then > if test "$cap" = yes && test "$linux" = yes && test "$attr" = yes; then > virtfs=yes > tools="$tools fsdev/virtfs-proxy-helper\$(EXESUF)" > else > if test "$virtfs" = yes; then > feature_not_found "virtfs" > fi > fi > fi > > and then later just > if test "$virtfs" = "yes" ; then > echo "CONFIG_VIRTFS=y" >> $config_host_mak > fi That's much cleaner. Thanks for the review. v2 patch coming up soon. -- Meador Inge CodeSourcery / Mentor Embedded http://www.mentor.com/embedded-software