Re: [Qemu-devel] [PATCH] configure: Enable dead code (lzo, snappy, quorum)

2014-06-10 Thread Stefan Hajnoczi 
On Tue, Apr 29, 2014 at 08:21:16AM +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.
 
 Signed-off-by: Stefan Weil s...@weilnetz.de
 ---
 
 I'm not sure whether this patch is trivial enough for qemu-trivial.
 Are there any disadvantages when this code is enabled?
 
 Stefan
 
  configure |   39 ---
  1 file changed, 24 insertions(+), 15 deletions(-)

Thanks, applied to my block tree:
https://github.com/stefanha/qemu/commits/block

Stefan


pgpk7CazDcoBj.pgp
Description: PGP signature

Re: [Qemu-devel] [PATCH] configure: Enable dead code (lzo, snappy, quorum)

2014-06-05 Thread Benoît Canet 
The Tuesday 29 Apr 2014 à 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.
 
 Signed-off-by: Stefan Weil s...@weilnetz.de
 ---
 
 I'm not sure whether this patch is trivial enough for qemu-trivial.
 Are there any disadvantages when this code is enabled?
 
 Stefan
 
  configure |   39 ---
  1 file changed, 24 insertions(+), 15 deletions(-)
 
 diff --git a/configure b/configure
 index 2fbec59..0faadd7 100755
 --- a/configure
 +++ b/configure
 @@ -301,8 +301,8 @@ libusb=
  usb_redir=
  glx=
  zlib=yes
 -lzo=no
 -snappy=no
 +lzo=
 +snappy=
  guest_agent=
  guest_agent_with_vss=no
  vss_win32_sdk=
 @@ -323,7 +323,7 @@ vte=
  tpm=no
  libssh2=
  vhdx=
 -quorum=no
 +quorum=
  
  # parse CC options first
  for opt do
 @@ -1023,8 +1023,12 @@ for opt do
;;
--disable-zlib-test) zlib=no
;;
 +  --disable-lzo) lzo=no
 +  ;;
--enable-lzo) lzo=yes
;;
 +  --disable-snappy) snappy=no
 +  ;;
--enable-snappy) snappy=yes
;;
--enable-guest-agent) guest_agent=yes
 @@ -1722,13 +1726,14 @@ if test $lzo != no ; then
  int main(void) { lzo_version(); return 0; }
  EOF
  if compile_prog  -llzo2 ; then
 -:
 +libs_softmmu=$libs_softmmu -llzo2
 +lzo=yes
  else
 -error_exit lzo check failed \
 -Make sure to have the lzo libs and headers installed.
 +if test $lzo = yes; then
 +feature_not_found liblzo2 Install liblzo2 devel
 +fi
 +lzo=no
  fi
 -
 -libs_softmmu=$libs_softmmu -llzo2
  fi
  
  ##
 @@ -1740,13 +1745,14 @@ if test $snappy != no ; then
  int main(void) { snappy_max_compressed_length(4096); return 0; }
  EOF
  if compile_prog  -lsnappy ; then
 -:
 +libs_softmmu=$libs_softmmu -lsnappy
 +snappy=yes
  else
 -error_exit snappy check failed \
 -Make sure to have the snappy libs and headers installed.
 +if test $snappy = yes; then
 +feature_not_found libsnappy Install libsnappy devel
 +fi
 +snappy=no
  fi
 -
 -libs_softmmu=$libs_softmmu -lsnappy
  fi
  
  ##
 @@ -2172,9 +2178,12 @@ if compile_prog $quorum_tls_cflags 
 $quorum_tls_libs ; then
libs_softmmu=$quorum_tls_libs $libs_softmmu
libs_tools=$quorum_tls_libs $libs_softmmu
QEMU_CFLAGS=$QEMU_CFLAGS $quorum_tls_cflags
 +  quorum=yes
  else
 -  echo gnutls  2.10.0 required to compile Quorum
 -  exit 1
 +  if test $quorum = yes; then
 +feature_not_found gnutls gnutls  2.10.0 required to compile Quorum
 +  fi
 +  quorum=no
  fi
  fi
  
 -- 
 1.7.10.4
 

Ping and Reviewed-by: Benoit Canet ben...@irqsave.net

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

Re: [Qemu-devel] [PATCH] configure: Enable dead code (lzo, snappy, quorum)

2014-05-02 Thread Stefan Hajnoczi 
On Tue, Apr 29, 2014 at 08:21:16AM +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.
 
 Signed-off-by: Stefan Weil s...@weilnetz.de
 ---
 
 I'm not sure whether this patch is trivial enough for qemu-trivial.
 Are there any disadvantages when this code is enabled?
 
 Stefan
 
  configure |   39 ---
  1 file changed, 24 insertions(+), 15 deletions(-)

Yes, please!  Let's build everything by default to avoid bitrot.

Reviewed-by: Stefan Hajnoczi stefa...@redhat.com

[Qemu-devel] [PATCH] configure: Enable dead code (lzo, snappy, quorum)

2014-04-29 Thread Stefan Weil 
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.

Signed-off-by: Stefan Weil s...@weilnetz.de
---

I'm not sure whether this patch is trivial enough for qemu-trivial.
Are there any disadvantages when this code is enabled?

Stefan

 configure |   39 ---
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/configure b/configure
index 2fbec59..0faadd7 100755
--- a/configure
+++ b/configure
@@ -301,8 +301,8 @@ libusb=
 usb_redir=
 glx=
 zlib=yes
-lzo=no
-snappy=no
+lzo=
+snappy=
 guest_agent=
 guest_agent_with_vss=no
 vss_win32_sdk=
@@ -323,7 +323,7 @@ vte=
 tpm=no
 libssh2=
 vhdx=
-quorum=no
+quorum=
 
 # parse CC options first
 for opt do
@@ -1023,8 +1023,12 @@ for opt do
   ;;
   --disable-zlib-test) zlib=no
   ;;
+  --disable-lzo) lzo=no
+  ;;
   --enable-lzo) lzo=yes
   ;;
+  --disable-snappy) snappy=no
+  ;;
   --enable-snappy) snappy=yes
   ;;
   --enable-guest-agent) guest_agent=yes
@@ -1722,13 +1726,14 @@ if test $lzo != no ; then
 int main(void) { lzo_version(); return 0; }
 EOF
 if compile_prog  -llzo2 ; then
-:
+libs_softmmu=$libs_softmmu -llzo2
+lzo=yes
 else
-error_exit lzo check failed \
-Make sure to have the lzo libs and headers installed.
+if test $lzo = yes; then
+feature_not_found liblzo2 Install liblzo2 devel
+fi
+lzo=no
 fi
-
-libs_softmmu=$libs_softmmu -llzo2
 fi
 
 ##
@@ -1740,13 +1745,14 @@ if test $snappy != no ; then
 int main(void) { snappy_max_compressed_length(4096); return 0; }
 EOF
 if compile_prog  -lsnappy ; then
-:
+libs_softmmu=$libs_softmmu -lsnappy
+snappy=yes
 else
-error_exit snappy check failed \
-Make sure to have the snappy libs and headers installed.
+if test $snappy = yes; then
+feature_not_found libsnappy Install libsnappy devel
+fi
+snappy=no
 fi
-
-libs_softmmu=$libs_softmmu -lsnappy
 fi
 
 ##
@@ -2172,9 +2178,12 @@ if compile_prog $quorum_tls_cflags $quorum_tls_libs 
; then
   libs_softmmu=$quorum_tls_libs $libs_softmmu
   libs_tools=$quorum_tls_libs $libs_softmmu
   QEMU_CFLAGS=$QEMU_CFLAGS $quorum_tls_cflags
+  quorum=yes
 else
-  echo gnutls  2.10.0 required to compile Quorum
-  exit 1
+  if test $quorum = yes; then
+feature_not_found gnutls gnutls  2.10.0 required to compile Quorum
+  fi
+  quorum=no
 fi
 fi
 
-- 
1.7.10.4

Re: [Qemu-devel] [PATCH] configure: Enable dead code (lzo, snappy, quorum)

2014-04-29 Thread qiaonuohan 

On 04/29/2014 02:21 PM, 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.

Signed-off-by: Stefan Weils...@weilnetz.de


Reviewed-by: Qiao Nuohan qiaonuo...@cn.fujitsu.com


---

I'm not sure whether this patch is trivial enough for qemu-trivial.
Are there any disadvantages when this code is enabled?

Stefan

  configure |   39 ---
  1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/configure b/configure
index 2fbec59..0faadd7 100755
--- a/configure
+++ b/configure
@@ -301,8 +301,8 @@ libusb=
  usb_redir=
  glx=
  zlib=yes
-lzo=no
-snappy=no
+lzo=
+snappy=
  guest_agent=
  guest_agent_with_vss=no
  vss_win32_sdk=
@@ -323,7 +323,7 @@ vte=
  tpm=no
  libssh2=
  vhdx=
-quorum=no
+quorum=

  # parse CC options first
  for opt do
@@ -1023,8 +1023,12 @@ for opt do
;;
--disable-zlib-test) zlib=no
;;
+  --disable-lzo) lzo=no
+  ;;
--enable-lzo) lzo=yes
;;
+  --disable-snappy) snappy=no
+  ;;
--enable-snappy) snappy=yes
;;
--enable-guest-agent) guest_agent=yes
@@ -1722,13 +1726,14 @@ if test $lzo != no ; then
  int main(void) { lzo_version(); return 0; }
  EOF
  if compile_prog  -llzo2 ; then
-:
+libs_softmmu=$libs_softmmu -llzo2
+lzo=yes
  else
-error_exit lzo check failed \
-Make sure to have the lzo libs and headers installed.
+if test $lzo = yes; then
+feature_not_found liblzo2 Install liblzo2 devel
+fi
+lzo=no
  fi
-
-libs_softmmu=$libs_softmmu -llzo2
  fi

  ##
@@ -1740,13 +1745,14 @@ if test $snappy != no ; then
  int main(void) { snappy_max_compressed_length(4096); return 0; }
  EOF
  if compile_prog  -lsnappy ; then
-:
+libs_softmmu=$libs_softmmu -lsnappy
+snappy=yes
  else
-error_exit snappy check failed \
-Make sure to have the snappy libs and headers installed.
+if test $snappy = yes; then
+feature_not_found libsnappy Install libsnappy devel
+fi
+snappy=no
  fi
-
-libs_softmmu=$libs_softmmu -lsnappy
  fi

  ##
@@ -2172,9 +2178,12 @@ if compile_prog $quorum_tls_cflags $quorum_tls_libs 
; then
libs_softmmu=$quorum_tls_libs $libs_softmmu
libs_tools=$quorum_tls_libs $libs_softmmu
QEMU_CFLAGS=$QEMU_CFLAGS $quorum_tls_cflags
+  quorum=yes
  else
-  echo gnutls  2.10.0 required to compile Quorum
-  exit 1
+  if test $quorum = yes; then
+feature_not_found gnutls gnutls  2.10.0 required to compile Quorum
+  fi
+  quorum=no
  fi
  fi




--
Regards
Qiao Nuohan

Re: [Qemu-devel] [PATCH] configure: Enable dead code (lzo, snappy, quorum)

2014-04-29 Thread Benoît Canet 
The Tuesday 29 Apr 2014 à 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.
 
 Signed-off-by: Stefan Weil s...@weilnetz.de
 ---
 
 I'm not sure whether this patch is trivial enough for qemu-trivial.
 Are there any disadvantages when this code is enabled?

No problem to enable quorum by default.
Kevin even asked me to do so in 2.1.

Reviewed-by: Benoit Canet ben...@irqsave.net

 
 Stefan
 
  configure |   39 ---
  1 file changed, 24 insertions(+), 15 deletions(-)
 
 diff --git a/configure b/configure
 index 2fbec59..0faadd7 100755
 --- a/configure
 +++ b/configure
 @@ -301,8 +301,8 @@ libusb=
  usb_redir=
  glx=
  zlib=yes
 -lzo=no
 -snappy=no
 +lzo=
 +snappy=
  guest_agent=
  guest_agent_with_vss=no
  vss_win32_sdk=
 @@ -323,7 +323,7 @@ vte=
  tpm=no
  libssh2=
  vhdx=
 -quorum=no
 +quorum=
  
  # parse CC options first
  for opt do
 @@ -1023,8 +1023,12 @@ for opt do
;;
--disable-zlib-test) zlib=no
;;
 +  --disable-lzo) lzo=no
 +  ;;
--enable-lzo) lzo=yes
;;
 +  --disable-snappy) snappy=no
 +  ;;
--enable-snappy) snappy=yes
;;
--enable-guest-agent) guest_agent=yes
 @@ -1722,13 +1726,14 @@ if test $lzo != no ; then
  int main(void) { lzo_version(); return 0; }
  EOF
  if compile_prog  -llzo2 ; then
 -:
 +libs_softmmu=$libs_softmmu -llzo2
 +lzo=yes
  else
 -error_exit lzo check failed \
 -Make sure to have the lzo libs and headers installed.
 +if test $lzo = yes; then
 +feature_not_found liblzo2 Install liblzo2 devel
 +fi
 +lzo=no
  fi
 -
 -libs_softmmu=$libs_softmmu -llzo2
  fi
  
  ##
 @@ -1740,13 +1745,14 @@ if test $snappy != no ; then
  int main(void) { snappy_max_compressed_length(4096); return 0; }
  EOF
  if compile_prog  -lsnappy ; then
 -:
 +libs_softmmu=$libs_softmmu -lsnappy
 +snappy=yes
  else
 -error_exit snappy check failed \
 -Make sure to have the snappy libs and headers installed.
 +if test $snappy = yes; then
 +feature_not_found libsnappy Install libsnappy devel
 +fi
 +snappy=no
  fi
 -
 -libs_softmmu=$libs_softmmu -lsnappy
  fi
  
  ##
 @@ -2172,9 +2178,12 @@ if compile_prog $quorum_tls_cflags 
 $quorum_tls_libs ; then
libs_softmmu=$quorum_tls_libs $libs_softmmu
libs_tools=$quorum_tls_libs $libs_softmmu
QEMU_CFLAGS=$QEMU_CFLAGS $quorum_tls_cflags
 +  quorum=yes
  else
 -  echo gnutls  2.10.0 required to compile Quorum
 -  exit 1
 +  if test $quorum = yes; then
 +feature_not_found gnutls gnutls  2.10.0 required to compile Quorum
 +  fi
 +  quorum=no
  fi
  fi
  
 -- 
 1.7.10.4