From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:49210) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TcyOW-00056A-Eu for qemu-devel@nongnu.org; Mon, 26 Nov 2012 08:06:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TcyOQ-0005Bq-42 for qemu-devel@nongnu.org; Mon, 26 Nov 2012 08:06:40 -0500 Received: from nodalink.pck.nerim.net ([62.212.105.220]:44856 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TcyOP-0005Bl-Rg for qemu-devel@nongnu.org; Mon, 26 Nov 2012 08:06:34 -0500 From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Mon, 26 Nov 2012 14:05:10 +0100 Message-Id: <1353935123-24199-12-git-send-email-benoit@irqsave.net> In-Reply-To: <1353935123-24199-1-git-send-email-benoit@irqsave.net> References: <1353935123-24199-1-git-send-email-benoit@irqsave.net> Subject: [Qemu-devel] [RFC V3 11/24] qcow2: Load and save deduplication table header extension. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@redhat.com Signed-off-by: Benoit Canet --- block/qcow2.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/block/qcow2.c b/block/qcow2.c index b5276c0..6329770 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -53,9 +53,15 @@ typedef struct { uint32_t len; } QCowExtension; +typedef struct { + uint64_t offset; + int32_t size; +} 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 +90,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 +155,18 @@ static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset, } break; + case QCOW2_EXT_MAGIC_DEDUP_TABLE: + 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); + break; + default: /* unknown magic - save it in case we need to rewrite the header */ { @@ -966,6 +985,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); @@ -1069,6 +1089,21 @@ int qcow2_update_header(BlockDriverState *bs) buf += ret; buflen -= ret; + if (s->has_dedup) { + dedup_table_extension.offset = cpu_to_be64(s->dedup_table_offset); + dedup_table_extension.size = cpu_to_be32(s->dedup_table_size); + 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); -- 1.7.10.4