From patchwork Fri Mar 15 14:49:29 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: 228017 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 5E1872C009A for ; Sat, 16 Mar 2013 01:53:04 +1100 (EST) Received: from localhost ([::1]:48321 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGW0E-0002vN-Jb for incoming@patchwork.ozlabs.org; Fri, 15 Mar 2013 10:53:02 -0400 Received: from eggs.gnu.org ([208.118.235.92]:36885) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGVyK-0000ai-5l for qemu-devel@nongnu.org; Fri, 15 Mar 2013 10:51:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UGVyC-00050b-6M for qemu-devel@nongnu.org; Fri, 15 Mar 2013 10:51:04 -0400 Received: from nodalink.pck.nerim.net ([62.212.105.220]:59613 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGVyB-00050I-HY for qemu-devel@nongnu.org; Fri, 15 Mar 2013 10:50:56 -0400 Received: by paradis.irqsave.net (Postfix, from userid 1002) id 9572F874352; Fri, 15 Mar 2013 15:50:54 +0100 (CET) Received: from localhost.localdomain (unknown [192.168.77.1]) by paradis.irqsave.net (Postfix) with ESMTP id C52E987435B; Fri, 15 Mar 2013 15:48:47 +0100 (CET) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Fri, 15 Mar 2013 15:49:29 +0100 Message-Id: <1363358986-8360-16-git-send-email-benoit@irqsave.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1363358986-8360-1-git-send-email-benoit@irqsave.net> References: <1363358986-8360-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, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@redhat.com Subject: [Qemu-devel] [RFC V7 15/32] qcow2: Load and save deduplication table header extension. 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 Signed-off-by: Benoit Canet --- block/qcow2.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/block/qcow2.c b/block/qcow2.c index ca38cc3..eaddcb6 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -53,9 +53,18 @@ typedef struct { uint32_t len; } QCowExtension; +typedef struct { + uint64_t offset; + int32_t size; + uint8_t hash_algo; + uint8_t strategies; + char reserved[56]; +} QCowDedupTableExtension; + #define QCOW2_EXT_MAGIC_END 0 #define QCOW2_EXT_MAGIC_BACKING_FORMAT 0xE2792ACA #define QCOW2_EXT_MAGIC_FEATURE_TABLE 0x6803f857 +#define QCOW2_EXT_MAGIC_DEDUP_TABLE 0xCD8E819B static int qcow2_probe(const uint8_t *buf, int buf_size, const char *filename) { @@ -84,6 +93,7 @@ static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset, QCowExtension ext; uint64_t offset; int ret; + QCowDedupTableExtension dedup_table_extension; #ifdef DEBUG_EXT printf("qcow2_read_extensions: start=%ld end=%ld\n", start_offset, end_offset); @@ -148,6 +158,25 @@ static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset, } break; + case QCOW2_EXT_MAGIC_DEDUP_TABLE: + if (ext.len > sizeof(dedup_table_extension)) { + fprintf(stderr, "ERROR: dedup_table_extension: len=%u too large" + " (>=%zu)\n", + ext.len, sizeof(dedup_table_extension)); + return 2; + } + ret = bdrv_pread(bs->file, offset, + &dedup_table_extension, ext.len); + if (ret < 0) { + return ret; + } + s->dedup_table_offset = + be64_to_cpu(dedup_table_extension.offset); + s->dedup_table_size = + be32_to_cpu(dedup_table_extension.size); + s->dedup_hash_algo = dedup_table_extension.hash_algo; + break; + default: /* unknown magic - save it in case we need to rewrite the header */ { @@ -959,6 +988,7 @@ int qcow2_update_header(BlockDriverState *bs) uint32_t refcount_table_clusters; size_t header_length; Qcow2UnknownHeaderExtension *uext; + QCowDedupTableExtension dedup_table_extension; buf = qemu_blockalign(bs, buflen); @@ -1062,6 +1092,25 @@ int qcow2_update_header(BlockDriverState *bs) buf += ret; buflen -= ret; + if (s->has_dedup) { + memset(&dedup_table_extension, 0, sizeof(dedup_table_extension)); + dedup_table_extension.offset = cpu_to_be64(s->dedup_table_offset); + dedup_table_extension.size = cpu_to_be32(s->dedup_table_size); + dedup_table_extension.hash_algo = s->dedup_hash_algo; + dedup_table_extension.strategies |= QCOW_DEDUP_STRATEGY_RAM; + dedup_table_extension.strategies |= QCOW_DEDUP_STRATEGY_RUNNING; + ret = header_ext_add(buf, + QCOW2_EXT_MAGIC_DEDUP_TABLE, + &dedup_table_extension, + sizeof(dedup_table_extension), + buflen); + if (ret < 0) { + goto fail; + } + buf += ret; + buflen -= ret; + } + /* Keep unknown header extensions */ QLIST_FOREACH(uext, &s->unknown_header_ext, next) { ret = header_ext_add(buf, uext->magic, uext->data, uext->len, buflen);