[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 08/15] qcow2: truncate preallocated space
From: |
Anton Nefedov |
Subject: |
[Qemu-devel] [PATCH v2 08/15] qcow2: truncate preallocated space |
Date: |
Thu, 1 Jun 2017 18:14:26 +0300 |
From: "Denis V. Lunev" <address@hidden>
This could be done after calculation of the end of data and metadata in
the qcow2 image.
Signed-off-by: Denis V. Lunev <address@hidden>
Signed-off-by: Anton Nefedov <address@hidden>
---
block/qcow2-cluster.c | 9 +++++++++
block/qcow2-refcount.c | 7 +++++++
block/qcow2.c | 8 ++++++++
block/qcow2.h | 3 +++
4 files changed, 27 insertions(+)
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index 88dd555..c39e825 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -1958,3 +1958,12 @@ fail:
g_free(l1_table);
return ret;
}
+
+void qcow2_update_data_end(BlockDriverState *bs, uint64_t off)
+{
+ BDRVQcow2State *s = bs->opaque;
+
+ if (s->data_end < off) {
+ s->data_end = off;
+ }
+}
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index 873a1d2..8156466 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -744,6 +744,9 @@ static int QEMU_WARN_UNUSED_RESULT
update_refcount(BlockDriverState *bs,
ret = alloc_refcount_block(bs, cluster_index, &refcount_block);
if (ret < 0) {
goto fail;
+ } else {
+ qcow2_update_data_end(bs, s->refcount_table_offset +
+ s->refcount_table_size * sizeof(uint64_t));
}
}
old_table_index = table_index;
@@ -865,6 +868,8 @@ retry:
s->free_cluster_index - 1 > (INT64_MAX >> s->cluster_bits))
{
return -EFBIG;
+ } else {
+ qcow2_update_data_end(bs, s->free_cluster_index << s->cluster_bits);
}
#ifdef DEBUG_ALLOC2
@@ -929,6 +934,8 @@ int64_t qcow2_alloc_clusters_at(BlockDriverState *bs,
uint64_t offset,
if (ret < 0) {
return ret;
+ } else {
+ qcow2_update_data_end(bs, offset + (nb_clusters << s->cluster_bits));
}
return i;
diff --git a/block/qcow2.c b/block/qcow2.c
index b090833..33e5455 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -1194,6 +1194,8 @@ static int qcow2_do_open(BlockDriverState *bs, QDict
*options, int flags,
}
}
+ s->data_end = bdrv_getlength(bs->file->bs);
+
#ifdef DEBUG_ALLOC
{
BdrvCheckResult result = {0};
@@ -1941,12 +1943,18 @@ static int qcow2_inactivate(BlockDriverState *bs)
static void qcow2_close(BlockDriverState *bs)
{
BDRVQcow2State *s = bs->opaque;
+
qemu_vfree(s->l1_table);
/* else pre-write overlap checks in cache_destroy may crash */
s->l1_table = NULL;
if (!(s->flags & BDRV_O_INACTIVE)) {
qcow2_inactivate(bs);
+
+ /* truncate preallocated space */
+ if (!bs->read_only && s->data_end < bdrv_getlength(bs->file->bs)) {
+ bdrv_truncate(bs->file, s->data_end, NULL);
+ }
}
cache_clean_timer_del(bs);
diff --git a/block/qcow2.h b/block/qcow2.h
index a0d222d..e28c54a 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -297,6 +297,7 @@ typedef struct BDRVQcow2State {
char *image_backing_format;
uint64_t prealloc_size;
+ uint64_t data_end;
} BDRVQcow2State;
typedef struct Qcow2COWRegion {
@@ -607,4 +608,6 @@ int qcow2_cache_get_empty(BlockDriverState *bs, Qcow2Cache
*c, uint64_t offset,
void **table);
void qcow2_cache_put(BlockDriverState *bs, Qcow2Cache *c, void **table);
+void qcow2_update_data_end(BlockDriverState *bs, uint64_t off);
+
#endif
--
2.7.4
- [Qemu-devel] [PATCH v2 04/15] qcow2: alloc space for COW in one chunk, (continued)
- [Qemu-devel] [PATCH v2 04/15] qcow2: alloc space for COW in one chunk, Anton Nefedov, 2017/06/01
- [Qemu-devel] [PATCH v2 05/15] qcow2: do not COW the empty areas, Anton Nefedov, 2017/06/01
- [Qemu-devel] [PATCH v2 03/15] blkdebug: support BDRV_REQ_ALLOCATE, Anton Nefedov, 2017/06/01
- [Qemu-devel] [PATCH v2 07/15] qcow2: set inactive flag, Anton Nefedov, 2017/06/01
- [Qemu-devel] [PATCH v2 10/15] qcow2: handle_prealloc(): find out if area zeroed by earlier preallocation, Anton Nefedov, 2017/06/01
- [Qemu-devel] [PATCH v2 06/15] qcow2: preallocation at image expand, Anton Nefedov, 2017/06/01
- [Qemu-devel] [PATCH v2 08/15] qcow2: truncate preallocated space,
Anton Nefedov <=
- [Qemu-devel] [PATCH v2 09/15] qcow2: check space leak at the end of the image, Anton Nefedov, 2017/06/01
- [Qemu-devel] [PATCH v2 11/15] qcow2: fix misleading comment about L2 linking, Anton Nefedov, 2017/06/01
- [Qemu-devel] [PATCH v2 12/15] qcow2-cluster: slightly refactor handle_dependencies(), Anton Nefedov, 2017/06/01
- [Qemu-devel] [PATCH v2 13/15] qcow2-cluster: make handle_dependencies() logic easier to follow, Anton Nefedov, 2017/06/01
- [Qemu-devel] [PATCH v2 15/15] iotest 046: test simultaneous cluster write error case, Anton Nefedov, 2017/06/01
- [Qemu-devel] [PATCH v2 14/15] qcow2: allow concurrent unaligned writes to the same clusters, Anton Nefedov, 2017/06/01
- Re: [Qemu-devel] [PATCH v2 00/15] qcow2: space preallocation and COW improvements, John Snow, 2017/06/01