From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:37738) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SoeFc-0000sz-S0 for qemu-devel@nongnu.org; Tue, 10 Jul 2012 13:29:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SoeFX-0007AH-US for qemu-devel@nongnu.org; Tue, 10 Jul 2012 13:29:28 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53445 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SoeFX-0007A7-K0 for qemu-devel@nongnu.org; Tue, 10 Jul 2012 13:29:23 -0400 Message-ID: <4FFC666D.2080703@suse.de> Date: Tue, 10 Jul 2012 19:29:17 +0200 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1341917019-23224-1-git-send-email-chouteau@adacore.com> In-Reply-To: <1341917019-23224-1-git-send-email-chouteau@adacore.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH] Add --disable-bridge-helper configure flag List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Fabien Chouteau Cc: Anthony Liguori , Stefan Hajnoczi , Stefan Weil , coreyb@linux.vnet.ibm.com, qemu-devel@nongnu.org, Luiz Capitulino , Blue Swirl , Paolo Bonzini , Michael Roth Am 10.07.2012 12:43, schrieb Fabien Chouteau: > Bridge helper uses ioctl's not available on old Linux versions, we add > this flag to disable the build. >=20 > Signed-off-by: Fabien Chouteau > --- > Makefile | 2 +- > configure | 8 ++++++++ > 2 files changed, 9 insertions(+), 1 deletion(-) >=20 > diff --git a/Makefile b/Makefile > index 34d6a9e..b46c6b0 100644 > --- a/Makefile > +++ b/Makefile > @@ -37,7 +37,7 @@ $(call set-vpath, $(SRC_PATH)) > =20 > LIBS+=3D-lz $(LIBS_TOOLS) > =20 > -HELPERS-$(CONFIG_LINUX) =3D qemu-bridge-helper$(EXESUF) > +HELPERS-$(CONFIG_HELPERS) =3D qemu-bridge-helper$(EXESUF) > =20 > ifdef BUILD_DOCS > DOCS=3Dqemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 QMP/q= mp-commands.txt Three quick comments: We should also disable build of all helpers when compiling with --static. I don't like the bridge helper being disabled based on CONFIG_HELPERS, suggest specific CONFIG_BRIDGE_HELPER or so. All --disable-* options should probably have an --enable-* counterpart. Andreas > diff --git a/configure b/configure > index 500fe24..5566752 100755 > --- a/configure > +++ b/configure > @@ -195,6 +195,7 @@ zlib=3D"yes" > guest_agent=3D"yes" > libiscsi=3D"" > coroutine=3D"" > +bridge_helper=3D"yes" > =20 > # parse CC options first > for opt do > @@ -824,6 +825,8 @@ for opt do > ;; > --disable-guest-agent) guest_agent=3D"no" > ;; > + --disable-bridge-helper) bridge_helper=3D"no" > + ;; > *) echo "ERROR: unknown option $opt"; show_help=3D"yes" > ;; > esac > @@ -1110,6 +1113,7 @@ echo " --disable-guest-agent disable building= of the QEMU Guest Agent" > echo " --enable-guest-agent enable building of the QEMU Guest Age= nt" > echo " --with-coroutine=3DBACKEND coroutine backend. Supported option= s:" > echo " gthread, ucontext, sigaltstack, windo= ws" > +echo " --disable-bridge-helper disable building of the qemu-bridge-h= elper" > echo "" > echo "NOTE: The object files are built at the place where configure is= launched" > exit 1 > @@ -3896,6 +3900,10 @@ if test "$tcg_interpreter" =3D "yes" ; then > echo "CONFIG_TCI_DIS=3Dy" >> $libdis_config_mak > fi > =20 > +if test "$bridge_helper" =3D "yes" && test "$linux" =3D "yes" ; then > + echo "CONFIG_HELPERS=3Dy" >> $config_host_mak > +fi > + > case "$ARCH" in > alpha) > # Ensure there's only a single GP >=20 --=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