From patchwork Wed Jan 16 15:47:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Beno=C3=AEt_Canet?= X-Patchwork-Id: 212806 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7EF962C0084 for ; Thu, 17 Jan 2013 03:30:49 +1100 (EST) Received: from localhost ([::1]:52107 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvVFZ-0005Gw-Du for incoming@patchwork.ozlabs.org; Wed, 16 Jan 2013 10:50:01 -0500 Received: from eggs.gnu.org ([208.118.235.92]:59325) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvVEi-0003Le-BV for qemu-devel@nongnu.org; Wed, 16 Jan 2013 10:49:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TvVEf-0004y7-Cj for qemu-devel@nongnu.org; Wed, 16 Jan 2013 10:49:08 -0500 Received: from nodalink.pck.nerim.net ([62.212.105.220]:42788 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvVEf-0004y1-4q for qemu-devel@nongnu.org; Wed, 16 Jan 2013 10:49:05 -0500 Received: by paradis.irqsave.net (Postfix, from userid 1002) id 571A3874309; Wed, 16 Jan 2013 17:20:39 +0100 (CET) Received: from localhost.localdomain (unknown [192.168.77.1]) by paradis.irqsave.net (Postfix) with ESMTP id 82E6487431E; Wed, 16 Jan 2013 17:19:46 +0100 (CET) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Wed, 16 Jan 2013 16:47:47 +0100 Message-Id: <1358351321-4891-9-git-send-email-benoit@irqsave.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1358351321-4891-1-git-send-email-benoit@irqsave.net> References: <1358351321-4891-1-git-send-email-benoit@irqsave.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 62.212.105.220 Cc: kwolf@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@redhat.com Subject: [Qemu-devel] [RFC V5 08/62] qcow2: Implement qcow2_compute_cluster_hash. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 a424af8..45b2326 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 <