From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:57499) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SosjO-0004S4-Qe for qemu-devel@nongnu.org; Wed, 11 Jul 2012 04:57:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SosjM-0002HF-K6 for qemu-devel@nongnu.org; Wed, 11 Jul 2012 04:57:10 -0400 Received: from mel.act-europe.fr ([194.98.77.210]:54810) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SosjM-0002H6-Au for qemu-devel@nongnu.org; Wed, 11 Jul 2012 04:57:08 -0400 Message-ID: <4FFD3FD8.8000300@adacore.com> Date: Wed, 11 Jul 2012 10:56:56 +0200 From: Fabien Chouteau MIME-Version: 1.0 References: <1341917019-23224-1-git-send-email-chouteau@adacore.com> <4FFC666D.2080703@suse.de> In-Reply-To: <4FFC666D.2080703@suse.de> 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: =?ISO-8859-15?Q?Andreas_F=E4rber?= Cc: Anthony Liguori , Stefan Hajnoczi , Stefan Weil , coreyb@linux.vnet.ibm.com, qemu-devel@nongnu.org, Luiz Capitulino , Blue Swirl , Paolo Bonzini , Michael Roth On 07/10/2012 07:29 PM, Andreas F=E4rber wrote: > 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. >> >> Signed-off-by: Fabien Chouteau >> --- >> Makefile | 2 +- >> configure | 8 ++++++++ >> 2 files changed, 9 insertions(+), 1 deletion(-) >> >> 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/= qmp-commands.txt >=20 > Three quick comments: >=20 > We should also disable build of all helpers when compiling with --stati= c. >=20 > 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. 3 easy fixes, I'll send a new version. >> 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 buildin= g of the QEMU Guest Agent" >> echo " --enable-guest-agent enable building of the QEMU Guest Ag= ent" >> echo " --with-coroutine=3DBACKEND coroutine backend. Supported optio= ns:" >> echo " gthread, ucontext, sigaltstack, wind= ows" >> +echo " --disable-bridge-helper disable building of the qemu-bridge-= helper" >> echo "" >> echo "NOTE: The object files are built at the place where configure i= s 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 --=20 Fabien Chouteau