[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC V8 14/24] qcow2: Load and save deduplication table hea
From: |
Benoît Canet |
Subject: |
[Qemu-devel] [RFC V8 14/24] qcow2: Load and save deduplication table header extension. |
Date: |
Thu, 20 Jun 2013 16:26:22 +0200 |
Signed-off-by: Benoit Canet <address@hidden>
---
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);
--
1.7.10.4
- [Qemu-devel] [RFC V8 03/24] qcow2: Add journal., (continued)
- [Qemu-devel] [RFC V8 03/24] qcow2: Add journal., Benoît Canet, 2013/06/20
- [Qemu-devel] [RFC V8 04/24] qcow2: Create the log store., Benoît Canet, 2013/06/20
- [Qemu-devel] [RFC V8 07/24] qcow2: Add qcow2_de dup_read_missing_and_concatenate, Benoît Canet, 2013/06/20
- [Qemu-devel] [RFC V8 08/24] qcow2: Create a way to link to l2 tables when deduplicating., Benoît Canet, 2013/06/20
- [Qemu-devel] [RFC V8 06/24] qcow2: Add the dedupl ication store., Benoît Canet, 2013/06/20
- [Qemu-devel] [RFC V8 05/24] qcow2: Add the hash s tore., Benoît Canet, 2013/06/20
- [Qemu-devel] [RFC V8 09/24] qcow2: Make qcow2_update_cluster_refcount public., Benoît Canet, 2013/06/20
- [Qemu-devel] [RFC V8 12/24] qcow2: Do allocate on rewrite on the dedup case., Benoît Canet, 2013/06/20
- [Qemu-devel] [RFC V8 10/24] qcow2: Add qcow2_dedup and related functions, Benoît Canet, 2013/06/20
- [Qemu-devel] [RFC V8 11/24] qcow2: Add qcow2_dedup_store_new_hashes., Benoît Canet, 2013/06/20
- [Qemu-devel] [RFC V8 14/24] qcow2: Load and save deduplication table header extension.,
Benoît Canet <=
- [Qemu-devel] [RFC V8 13/24] qcow2: Implement qcow2_compute_cluster_hash., Benoît Canet, 2013/06/20
- [Qemu-devel] [RFC V8 17/24] qcow2: Drop hash for a given cluster when dedup makes refcount > 2^16/2., Benoît Canet, 2013/06/20
- [Qemu-devel] [RFC V8 15/24] qcow2: Extract qcow2_set_incompat_feature and qcow2_clear_incompat_feature., Benoît Canet, 2013/06/20
- [Qemu-devel] [RFC V8 19/24] qcow2: Integrate deduplication in qcow2_co_writev loop., Benoît Canet, 2013/06/20
- [Qemu-devel] [RFC V8 16/24] block: Add qcow2_dedup format and image creation code., Benoît Canet, 2013/06/20
- [Qemu-devel] [RFC V8 22/24] qcow2: Add qcow2_dedup_init and qcow2_dedup_close., Benoît Canet, 2013/06/20
- [Qemu-devel] [RFC V8 21/24] qcow2: Integrate SKEIN hash algorithm in deduplication., Benoît Canet, 2013/06/20
- [Qemu-devel] [RFC V8 23/24] qcow2: Enable the deduplication feature., Benoît Canet, 2013/06/20
- [Qemu-devel] [RFC V8 24/24] qcow2: Enable deduplication tests, Benoît Canet, 2013/06/20
- [Qemu-devel] [RFC V8 18/24] qcow2: Remove hash when cluster is deleted., Benoît Canet, 2013/06/20