提交 b25c9dff 编写于 作者: S Stefan Weil 提交者: Stefan Hajnoczi

configure: Enable dead code (lzo, snappy, quorum)

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.

[Building quorum by default "broke" qemu-iotests ./check 081.  It turns
out the 081.out master output was just bitrotted.  Fix this by updating
the error message.
--Stefan]
Signed-off-by: NStefan Weil <sw@weilnetz.de>
Reviewed-by: NQiao Nuohan <qiaonuohan@cn.fujitsu.com>
Reviewed-by: NBenoit Canet <benoit@irqsave.net>
Reviewed-by: NStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: NStefan Hajnoczi <stefanha@redhat.com>
上级 06a59afa
...@@ -311,8 +311,8 @@ libusb="" ...@@ -311,8 +311,8 @@ libusb=""
usb_redir="" usb_redir=""
glx="" glx=""
zlib="yes" zlib="yes"
lzo="no" lzo=""
snappy="no" snappy=""
guest_agent="" guest_agent=""
guest_agent_with_vss="no" guest_agent_with_vss="no"
vss_win32_sdk="" vss_win32_sdk=""
...@@ -333,7 +333,7 @@ vte="" ...@@ -333,7 +333,7 @@ vte=""
tpm="no" tpm="no"
libssh2="" libssh2=""
vhdx="" vhdx=""
quorum="no" quorum=""
# parse CC options first # parse CC options first
for opt do for opt do
...@@ -1050,8 +1050,12 @@ for opt do ...@@ -1050,8 +1050,12 @@ for opt do
;; ;;
--disable-zlib-test) zlib="no" --disable-zlib-test) zlib="no"
;; ;;
--disable-lzo) lzo="no"
;;
--enable-lzo) lzo="yes" --enable-lzo) lzo="yes"
;; ;;
--disable-snappy) snappy="no"
;;
--enable-snappy) snappy="yes" --enable-snappy) snappy="yes"
;; ;;
--enable-guest-agent) guest_agent="yes" --enable-guest-agent) guest_agent="yes"
...@@ -1749,13 +1753,14 @@ if test "$lzo" != "no" ; then ...@@ -1749,13 +1753,14 @@ if test "$lzo" != "no" ; then
int main(void) { lzo_version(); return 0; } int main(void) { lzo_version(); return 0; }
EOF EOF
if compile_prog "" "-llzo2" ; then if compile_prog "" "-llzo2" ; then
: libs_softmmu="$libs_softmmu -llzo2"
lzo="yes"
else else
error_exit "lzo check failed" \ if test "$lzo" = "yes"; then
"Make sure to have the lzo libs and headers installed." feature_not_found "liblzo2" "Install liblzo2 devel"
fi
lzo="no"
fi fi
libs_softmmu="$libs_softmmu -llzo2"
fi fi
########################################## ##########################################
...@@ -1767,13 +1772,14 @@ if test "$snappy" != "no" ; then ...@@ -1767,13 +1772,14 @@ if test "$snappy" != "no" ; then
int main(void) { snappy_max_compressed_length(4096); return 0; } int main(void) { snappy_max_compressed_length(4096); return 0; }
EOF EOF
if compile_prog "" "-lsnappy" ; then if compile_prog "" "-lsnappy" ; then
: libs_softmmu="$libs_softmmu -lsnappy"
snappy="yes"
else else
error_exit "snappy check failed" \ if test "$snappy" = "yes"; then
"Make sure to have the snappy libs and headers installed." feature_not_found "libsnappy" "Install libsnappy devel"
fi
snappy="no"
fi fi
libs_softmmu="$libs_softmmu -lsnappy"
fi fi
########################################## ##########################################
...@@ -2219,9 +2225,12 @@ if compile_prog "$quorum_tls_cflags" "$quorum_tls_libs" ; then ...@@ -2219,9 +2225,12 @@ if compile_prog "$quorum_tls_cflags" "$quorum_tls_libs" ; then
libs_softmmu="$quorum_tls_libs $libs_softmmu" libs_softmmu="$quorum_tls_libs $libs_softmmu"
libs_tools="$quorum_tls_libs $libs_softmmu" libs_tools="$quorum_tls_libs $libs_softmmu"
QEMU_CFLAGS="$QEMU_CFLAGS $quorum_tls_cflags" QEMU_CFLAGS="$QEMU_CFLAGS $quorum_tls_cflags"
quorum="yes"
else else
echo "gnutls > 2.10.0 required to compile Quorum" if test "$quorum" = "yes"; then
exit 1 feature_not_found "gnutls" "gnutls > 2.10.0 required to compile Quorum"
fi
quorum="no"
fi fi
fi fi
......
...@@ -45,5 +45,5 @@ wrote 10485760/10485760 bytes at offset 0 ...@@ -45,5 +45,5 @@ wrote 10485760/10485760 bytes at offset 0
10 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) 10 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
== checking that quorum is broken == == checking that quorum is broken ==
qemu-io: can't open device (null): Could not read image for determining its format: Input/output error qemu-io: can't open: Could not read image for determining its format: Input/output error
*** done *** done
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册