From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:53275) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TqR0L-0001TZ-Qc for qemu-devel@nongnu.org; Wed, 02 Jan 2013 11:17:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TqR0C-00064a-0G for qemu-devel@nongnu.org; Wed, 02 Jan 2013 11:17:21 -0500 Received: from nodalink.pck.nerim.net ([62.212.105.220]:56202 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TqR0B-00064P-N0 for qemu-devel@nongnu.org; Wed, 02 Jan 2013 11:17:11 -0500 From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Wed, 2 Jan 2013 17:16:11 +0100 Message-Id: <1357143393-29832-9-git-send-email-benoit@irqsave.net> In-Reply-To: <1357143393-29832-1-git-send-email-benoit@irqsave.net> References: <1357143393-29832-1-git-send-email-benoit@irqsave.net> Subject: [Qemu-devel] [RFC V4 08/30] qcow2: Implement qcow2_compute_cluster_hash. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@redhat.com Add detection of libgnutls used to compute SHA256 hashes Signed-off-by: Benoit Canet --- block/qcow2-dedup.c | 13 ++++++++++++- configure | 22 ++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/block/qcow2-dedup.c b/block/qcow2-dedup.c index 2a444f5..0914267 100644 --- a/block/qcow2-dedup.c +++ b/block/qcow2-dedup.c @@ -25,6 +25,8 @@ * THE SOFTWARE. */ +#include +#include #include "block/block_int.h" #include "qemu-common.h" #include "qcow2.h" @@ -157,7 +159,16 @@ static int qcow2_compute_cluster_hash(BlockDriverState *bs, QCowHash *hash, uint8_t *data) { - return 0; + BDRVQcowState *s = bs->opaque; + switch (s->dedup_hash_algo) { + case QCOW_HASH_SHA256: + return gnutls_hash_fast(GNUTLS_DIG_SHA256, data, + s->cluster_size, hash->data); + default: + error_report("Invalid deduplication hash algorithm %i", + s->dedup_hash_algo); + abort(); + } } /* diff --git a/configure b/configure index 99c1ec3..390326e 100755 --- a/configure +++ b/configure @@ -1724,6 +1724,28 @@ EOF fi ########################################## +# QCOW Deduplication gnutls detection +cat > $TMPC < +#include +int main(void) {char data[4096], digest[32]; +gnutls_hash_fast(GNUTLS_DIG_SHA256, data, 4096, digest); +return 0; +} +EOF +qcow_tls_cflags=`$pkg_config --cflags gnutls 2> /dev/null` +qcow_tls_libs=`$pkg_config --libs gnutls 2> /dev/null` +if compile_prog "$qcow_tls_cflags" "$qcow_tls_libs" ; then + qcow_tls=yes + libs_softmmu="$qcow_tls_libs $libs_softmmu" + libs_tools="$qcow_tls_libs $libs_softmmu" + QEMU_CFLAGS="$QEMU_CFLAGS $qcow_tls_cflags" +else + echo "gnutls > 2.10.0 required to compile QEMU" + exit 1 +fi + +########################################## # VNC SASL detection if test "$vnc" = "yes" -a "$vnc_sasl" != "no" ; then cat > $TMPC <