qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Benoît Canet" <benoit@irqsave.net>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, "Benoît Canet" <benoit@irqsave.net>,
	stefanha@redhat.com
Subject: [Qemu-devel] [RFC V2 08/20] qcow2: Implement qcow2_compute_cluster_hash.
Date: Wed, 17 Oct 2012 18:00:17 +0200	[thread overview]
Message-ID: <1350489629-1838-9-git-send-email-benoit@irqsave.net> (raw)
In-Reply-To: <1350489629-1838-1-git-send-email-benoit@irqsave.net>

---
 Makefile            |    3 +++
 Makefile.target     |    2 +-
 block/qcow2-dedup.c |   10 ++++++++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index a9c22bf..b4dab79 100644
--- a/Makefile
+++ b/Makefile
@@ -166,6 +166,9 @@ qemu-img$(EXESUF): qemu-img.o $(tools-obj-y) $(block-obj-y) $(qapi-obj-y) \
                               qapi-visit.o qapi-types.o
 qemu-nbd$(EXESUF): qemu-nbd.o $(tools-obj-y) $(block-obj-y)
 qemu-io$(EXESUF): qemu-io.o cmd.o $(tools-obj-y) $(block-obj-y)
+qemu-img$(EXESUF): LIBS+=-lcrypto
+qemu-nbd$(EXESUF): LIBS+=-lcrypto
+qemu-io$(EXESUF): LIBS+=-lcrypto
 
 qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o
 
diff --git a/Makefile.target b/Makefile.target
index 3822bc5..f9a988a 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -119,7 +119,7 @@ obj-$(CONFIG_HAVE_GET_MEMORY_MAPPING) += memory_mapping.o
 obj-$(CONFIG_HAVE_CORE_DUMP) += dump.o
 obj-$(CONFIG_NO_GET_MEMORY_MAPPING) += memory_mapping-stub.o
 obj-$(CONFIG_NO_CORE_DUMP) += dump-stub.o
-LIBS+=-lz
+LIBS+=-lz -lcrypto
 
 QEMU_CFLAGS += $(VNC_TLS_CFLAGS)
 QEMU_CFLAGS += $(VNC_SASL_CFLAGS)
diff --git a/block/qcow2-dedup.c b/block/qcow2-dedup.c
index 50d61f2..c626720 100644
--- a/block/qcow2-dedup.c
+++ b/block/qcow2-dedup.c
@@ -25,11 +25,13 @@
  * THE SOFTWARE.
  */
 
+#include <openssl/sha.h>
+#include <openssl/evp.h>
 #include "block_int.h"
 #include "qemu-common.h"
 #include "qcow2.h"
 
-#define HASH_LENGTH 32
+#define HASH_LENGTH SHA256_DIGEST_LENGTH
 
 /**
  * Read some data from the QCOW2 file
@@ -217,7 +219,11 @@ static bool qcow2_dedup_insert_hash_in_rb_tree(BlockDriverState *bs,
 static uint8_t *qcow2_compute_cluster_hash(BlockDriverState *bs,
                                            uint8_t *data)
 {
-    return NULL;
+    BDRVQcowState *s = bs->opaque;
+    uint8_t *hash = g_malloc0(HASH_LENGTH);
+    EVP_Digest(data, s->cluster_size,
+               hash, NULL, EVP_sha256(), NULL);
+    return hash;
 }
 
 /* Try to find the offset of a given cluster if it's duplicated
-- 
1.7.10.4

  parent reply	other threads:[~2012-10-17 16:01 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-17 16:00 [Qemu-devel] [RFC V2 00/20] QCOW2 deduplication Benoît Canet
2012-10-17 16:00 ` [Qemu-devel] [RFC V2 01/20] qcow2: Add deduplication to the qcow2 specification Benoît Canet
2012-10-17 16:28   ` Eric Blake
2012-10-18  9:06     ` Benoît Canet
2012-10-17 16:00 ` [Qemu-devel] [RFC V2 02/20] qcow2: Add kernel red black trees Benoît Canet
2012-10-17 16:00 ` [Qemu-devel] [RFC V2 03/20] qcow2: Add deduplication structures and fields Benoît Canet
2012-10-17 16:00 ` [Qemu-devel] [RFC V2 04/20] qcow2: Add qcow2_dedup_read_missing_and_concatenate Benoît Canet
2012-10-17 16:00 ` [Qemu-devel] [RFC V2 05/20] qcow2: Rename update_refcount into qcow2_update_refcount Benoît Canet
2012-10-17 16:00 ` [Qemu-devel] [RFC V2 06/20] qcow2: Add qcow2_dedup and related functions Benoît Canet
2012-10-17 16:00 ` [Qemu-devel] [RFC V2 07/20] qcow2: Add qcow2_dedup_write_new_hashes Benoît Canet
2012-10-17 16:00 ` Benoît Canet [this message]
2012-10-17 16:00 ` [Qemu-devel] [RFC V2 09/20] qcow2: Add qcow2_co_load_dedup_hashes Benoît Canet
2012-10-17 16:00 ` [Qemu-devel] [RFC V2 10/20] qcow2: Add qcow2_dedup_grow_table Benoît Canet
2012-10-17 16:00 ` [Qemu-devel] [RFC V2 11/20] qcow2: Load and save deduplication table header extension Benoît Canet
2012-10-17 16:00 ` [Qemu-devel] [RFC V2 12/20] qcow2: Extract qcow2_do_table_init Benoît Canet
2012-10-17 16:00 ` [Qemu-devel] [RFC V2 13/20] qcow2: Add qcow2_dedup_init and qcow2_dedup_close Benoît Canet
2012-10-17 16:00 ` [Qemu-devel] [RFC V2 14/20] qcow2: Extract qcow2_add_feature and qcow2_remove_feature Benoît Canet
2012-10-17 16:00 ` [Qemu-devel] [RFC V2 15/20] block: Add dedup image create option Benoît Canet
2012-10-17 16:00 ` [Qemu-devel] [RFC V2 16/20] qcow2: Allow creation of images using deduplication Benoît Canet
2012-10-17 16:00 ` [Qemu-devel] [RFC V2 17/20] qcow2: Integrate deduplication in qcow2_co_writev loop Benoît Canet
2012-10-17 16:00 ` [Qemu-devel] [RFC V2 18/20] qcow2: Add method to destroy the deduplication red black tree Benoît Canet
2012-10-17 16:00 ` [Qemu-devel] [RFC V2 19/20] qcow2: init and cleanup deduplication Benoît Canet
2012-10-17 16:00 ` [Qemu-devel] [RFC V2 20/20] qemu-iotests: Filter dedup=on/off so existing tests don't break Benoît Canet
2012-10-17 17:09 ` [Qemu-devel] [RFC V2 00/20] QCOW2 deduplication Avi Kivity
2012-10-18  8:32   ` Benoît Canet

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1350489629-1838-9-git-send-email-benoit@irqsave.net \
    --to=benoit@irqsave.net \
    --cc=kwolf@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).