[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v4 03/17] qcow2: Create metadata list
From: |
Max Reitz |
Subject: |
[Qemu-block] [PATCH v4 03/17] qcow2: Create metadata list |
Date: |
Mon, 4 May 2015 21:15:39 +0200 |
Create and destroy the metadata list on creation and destruction of a
qcow2 BDS, respectively. Skip creation if no overlap checks should be
performed.
Signed-off-by: Max Reitz <address@hidden>
---
block/qcow2.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/block/qcow2.c b/block/qcow2.c
index c46dc4c..b15a612 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -758,6 +758,14 @@ static int qcow2_open(BlockDriverState *bs, QDict
*options, int flags,
s->csize_mask = (1 << (s->cluster_bits - 8)) - 1;
s->cluster_offset_mask = (1LL << s->csize_shift) - 1;
+ if (s->overlap_check) {
+ /* TODO: Let the user override this default */
+ ret = qcow2_create_empty_metadata_list(bs, 65536, errp);
+ if (ret < 0) {
+ goto fail;
+ }
+ }
+
s->refcount_table_offset = header.refcount_table_offset;
s->refcount_table_size =
header.refcount_table_clusters << (s->cluster_bits - 3);
@@ -1012,6 +1020,7 @@ static int qcow2_open(BlockDriverState *bs, QDict
*options, int flags,
}
g_free(s->cluster_cache);
qemu_vfree(s->cluster_data);
+ qcow2_metadata_list_destroy(bs);
return ret;
}
@@ -1466,6 +1475,8 @@ static void qcow2_close(BlockDriverState *bs)
qemu_vfree(s->cluster_data);
qcow2_refcount_close(bs);
qcow2_free_snapshots(bs);
+
+ qcow2_metadata_list_destroy(bs);
}
static void qcow2_invalidate_cache(BlockDriverState *bs, Error **errp)
--
2.3.7
- [Qemu-block] [PATCH v4 00/17] qcow2: Add new overlap check functions, Max Reitz, 2015/05/04
- [Qemu-block] [PATCH v4 02/17] qcow2: Pull up overlap check option evaluation, Max Reitz, 2015/05/04
- [Qemu-block] [PATCH v4 01/17] qcow2: Add new overlap check functions, Max Reitz, 2015/05/04
- [Qemu-block] [PATCH v4 03/17] qcow2: Create metadata list,
Max Reitz <=
- [Qemu-block] [PATCH v4 04/17] qcow2/overlaps: Protect image header, Max Reitz, 2015/05/04
- [Qemu-block] [PATCH v4 05/17] qcow2/overlaps: Protect refcount table, Max Reitz, 2015/05/04
- [Qemu-block] [PATCH v4 06/17] qcow2/overlaps: Protect refcount blocks, Max Reitz, 2015/05/04
- [Qemu-block] [PATCH v4 07/17] qcow2/overlaps: Protect active L1 table, Max Reitz, 2015/05/04
- [Qemu-block] [PATCH v4 08/17] qcow2/overlaps: Protect active L2 tables, Max Reitz, 2015/05/04
- [Qemu-block] [PATCH v4 09/17] qcow2/overlaps: Protect snapshot table, Max Reitz, 2015/05/04
- [Qemu-block] [PATCH v4 10/17] qcow2/overlaps: Protect inactive L1 tables, Max Reitz, 2015/05/04
- [Qemu-block] [PATCH v4 11/17] qcow2/overlaps: Protect inactive L2 tables, Max Reitz, 2015/05/04
- [Qemu-block] [PATCH v4 12/17] qcow2: Use new metadata overlap check function, Max Reitz, 2015/05/04
- [Qemu-block] [PATCH v4 13/17] qcow2/overlaps: Add "memory limit reached" event, Max Reitz, 2015/05/04