From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:44725)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <benoit.canet@irqsave.net>) id 1WsWh0-0005BH-I2
	for qemu-devel@nongnu.org; Thu, 05 Jun 2014 08:22:55 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <benoit.canet@irqsave.net>) id 1WsWgw-0000PB-27
	for qemu-devel@nongnu.org; Thu, 05 Jun 2014 08:22:50 -0400
Received: from lputeaux-656-01-25-125.w80-12.abo.wanadoo.fr
	([80.12.84.125]:45546 helo=paradis.irqsave.net)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <benoit.canet@irqsave.net>) id 1WsWgv-0000Oj-Q6
	for qemu-devel@nongnu.org; Thu, 05 Jun 2014 08:22:46 -0400
Date: Thu, 5 Jun 2014 14:22:43 +0200
From: =?iso-8859-1?Q?Beno=EEt?= Canet <benoit.canet@irqsave.net>
Message-ID: <20140605122243.GE10006@irqsave.net>
References: <1398752476-23448-1-git-send-email-sw@weilnetz.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
In-Reply-To: <1398752476-23448-1-git-send-email-sw@weilnetz.de>
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH] configure: Enable dead code (lzo, snappy,
	quorum)
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Stefan Weil <sw@weilnetz.de>
Cc: Qiao Nuohan <qiaonuohan@cn.fujitsu.com>, qemu-devel@nongnu.org

The Tuesday 29 Apr 2014 =E0 08:21:16 (+0200), Stefan Weil wrote :
> Those options were not enabled by default, even when the build
> environment would have supported them, so the corresponding
> code was not compiled in normal test builds like on build bots.
>=20
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
>=20
> I'm not sure whether this patch is trivial enough for qemu-trivial.
> Are there any disadvantages when this code is enabled?
>=20
> Stefan
>=20
>  configure |   39 ++++++++++++++++++++++++---------------
>  1 file changed, 24 insertions(+), 15 deletions(-)
>=20
> diff --git a/configure b/configure
> index 2fbec59..0faadd7 100755
> --- a/configure
> +++ b/configure
> @@ -301,8 +301,8 @@ libusb=3D""
>  usb_redir=3D""
>  glx=3D""
>  zlib=3D"yes"
> -lzo=3D"no"
> -snappy=3D"no"
> +lzo=3D""
> +snappy=3D""
>  guest_agent=3D""
>  guest_agent_with_vss=3D"no"
>  vss_win32_sdk=3D""
> @@ -323,7 +323,7 @@ vte=3D""
>  tpm=3D"no"
>  libssh2=3D""
>  vhdx=3D""
> -quorum=3D"no"
> +quorum=3D""
> =20
>  # parse CC options first
>  for opt do
> @@ -1023,8 +1023,12 @@ for opt do
>    ;;
>    --disable-zlib-test) zlib=3D"no"
>    ;;
> +  --disable-lzo) lzo=3D"no"
> +  ;;
>    --enable-lzo) lzo=3D"yes"
>    ;;
> +  --disable-snappy) snappy=3D"no"
> +  ;;
>    --enable-snappy) snappy=3D"yes"
>    ;;
>    --enable-guest-agent) guest_agent=3D"yes"
> @@ -1722,13 +1726,14 @@ if test "$lzo" !=3D "no" ; then
>  int main(void) { lzo_version(); return 0; }
>  EOF
>      if compile_prog "" "-llzo2" ; then
> -        :
> +        libs_softmmu=3D"$libs_softmmu -llzo2"
> +        lzo=3D"yes"
>      else
> -        error_exit "lzo check failed" \
> -            "Make sure to have the lzo libs and headers installed."
> +        if test "$lzo" =3D "yes"; then
> +            feature_not_found "liblzo2" "Install liblzo2 devel"
> +        fi
> +        lzo=3D"no"
>      fi
> -
> -    libs_softmmu=3D"$libs_softmmu -llzo2"
>  fi
> =20
>  ##########################################
> @@ -1740,13 +1745,14 @@ if test "$snappy" !=3D "no" ; then
>  int main(void) { snappy_max_compressed_length(4096); return 0; }
>  EOF
>      if compile_prog "" "-lsnappy" ; then
> -        :
> +        libs_softmmu=3D"$libs_softmmu -lsnappy"
> +        snappy=3D"yes"
>      else
> -        error_exit "snappy check failed" \
> -            "Make sure to have the snappy libs and headers installed."
> +        if test "$snappy" =3D "yes"; then
> +            feature_not_found "libsnappy" "Install libsnappy devel"
> +        fi
> +        snappy=3D"no"
>      fi
> -
> -    libs_softmmu=3D"$libs_softmmu -lsnappy"
>  fi
> =20
>  ##########################################
> @@ -2172,9 +2178,12 @@ if compile_prog "$quorum_tls_cflags" "$quorum_tl=
s_libs" ; then
>    libs_softmmu=3D"$quorum_tls_libs $libs_softmmu"
>    libs_tools=3D"$quorum_tls_libs $libs_softmmu"
>    QEMU_CFLAGS=3D"$QEMU_CFLAGS $quorum_tls_cflags"
> +  quorum=3D"yes"
>  else
> -  echo "gnutls > 2.10.0 required to compile Quorum"
> -  exit 1
> +  if test "$quorum" =3D "yes"; then
> +    feature_not_found "gnutls" "gnutls > 2.10.0 required to compile Qu=
orum"
> +  fi
> +  quorum=3D"no"
>  fi
>  fi
> =20
> --=20
> 1.7.10.4
>=20

Ping and Reviewed-by: Benoit Canet <benoit@irqsave.net>

This should go in for 2.1 as Kevin asked to enable quorum by default.