From patchwork Thu Jun 20 14:26:22 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: 252958 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0EF942C009D for ; Fri, 21 Jun 2013 00:36:39 +1000 (EST) Received: from localhost ([::1]:41848 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UpfyW-0005iw-Dq for incoming@patchwork.ozlabs.org; Thu, 20 Jun 2013 10:36:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60363) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Upfqq-0003JE-M4 for qemu-devel@nongnu.org; Thu, 20 Jun 2013 10:28:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Upfqi-0001M1-5m for qemu-devel@nongnu.org; Thu, 20 Jun 2013 10:28:40 -0400 Received: from nodalink.pck.nerim.net ([62.212.105.220]:37603 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Upfqh-0001Kc-Jr for qemu-devel@nongnu.org; Thu, 20 Jun 2013 10:28:32 -0400 Received: by paradis.irqsave.net (Postfix, from userid 1002) id CB5A2874674; Thu, 20 Jun 2013 16:28:30 +0200 (CEST) Received: from localhost.localdomain (unknown [192.168.77.1]) by paradis.irqsave.net (Postfix) with ESMTP id 57179874679; Thu, 20 Jun 2013 16:25:01 +0200 (CEST) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Thu, 20 Jun 2013 16:26:22 +0200 Message-Id: <1371738392-9594-15-git-send-email-benoit@irqsave.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1371738392-9594-1-git-send-email-benoit@irqsave.net> References: <1371738392-9594-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 V8 14/24] 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 | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/block/qcow2.c b/block/qcow2.c index 34b2a87..3cd1051 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -54,9 +54,19 @@ typedef struct { uint32_t len; } QCowExtension; +typedef struct { + uint64_t offset; + uint32_t size; + uint32_t max; + uint32_t flags; + uint8_t hash_algo; + char reserved[56]; +} QCowDedupConfExtension; + #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) { @@ -85,6 +95,7 @@ static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset, QCowExtension ext; uint64_t offset; int ret; + QCowDedupConfExtension dedup_conf_ext; #ifdef DEBUG_EXT printf("qcow2_read_extensions: start=%ld end=%ld\n", start_offset, end_offset); @@ -149,6 +160,28 @@ static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset, } break; + case QCOW2_EXT_MAGIC_DEDUP_TABLE: + if (ext.len > sizeof(dedup_conf_ext)) { + fprintf(stderr, "ERROR: dedup_conf_ext: len=%u too large" + " (>=%zu)\n", + ext.len, sizeof(dedup_conf_ext)); + return 2; + } + ret = bdrv_pread(bs->file, offset, + &dedup_conf_ext, ext.len); + if (ret < 0) { + return ret; + } + s->dedup_conf_offset = + be64_to_cpu(dedup_conf_ext.offset); + s->dedup_conf_size = + be32_to_cpu(dedup_conf_ext.size); + s->dedup_max_incarnations = + be32_to_cpu(dedup_conf_ext.max); + s->dedup_hash_algo = dedup_conf_ext.hash_algo; + s->dedup_dirty = dedup_conf_ext.flags & QCOW_DEDUP_DIRTY; + break; + default: /* unknown magic - save it in case we need to rewrite the header */ { @@ -1006,6 +1039,7 @@ int qcow2_update_header(BlockDriverState *bs) uint32_t refcount_table_clusters; size_t header_length; Qcow2UnknownHeaderExtension *uext; + QCowDedupConfExtension dedup_conf_ext; buf = qemu_blockalign(bs, buflen); @@ -1109,6 +1143,25 @@ int qcow2_update_header(BlockDriverState *bs) buf += ret; buflen -= ret; + if (s->has_dedup) { + memset(&dedup_conf_ext, 0, sizeof(dedup_conf_ext)); + dedup_conf_ext.offset = cpu_to_be64(s->dedup_conf_offset); + dedup_conf_ext.size = cpu_to_be32(s->dedup_conf_size); + dedup_conf_ext.max = cpu_to_be32(s->dedup_max_incarnations); + dedup_conf_ext.hash_algo = s->dedup_hash_algo; + dedup_conf_ext.flags = s->dedup_dirty ? QCOW_DEDUP_DIRTY : 0; + ret = header_ext_add(buf, + QCOW2_EXT_MAGIC_DEDUP_TABLE, + &dedup_conf_ext, + sizeof(dedup_conf_ext), + 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);