[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 39/53] block/qcow2: Implement status CB for amend
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 39/53] block/qcow2: Implement status CB for amend |
Date: |
Mon, 3 Nov 2014 11:50:42 +0000 |
From: Max Reitz <address@hidden>
The only really time-consuming operation potentially performed by
qcow2_amend_options() is zero cluster expansion when downgrading qcow2
images from compat=1.1 to compat=0.10, so report status of that
operation and that operation only through the status CB.
For this, approximate the progress as the number of L1 entries visited
during the operation.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: BenoƮt Canet <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Reviewed-by: Benoit Canet <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block/qcow2-cluster.c | 37 +++++++++++++++++++++++++++++++++----
block/qcow2.c | 7 ++++---
block/qcow2.h | 3 ++-
3 files changed, 39 insertions(+), 8 deletions(-)
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index 8411f5e..5687a4b 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -1618,10 +1618,17 @@ fail:
* zero expansion (i.e., has been filled with zeroes and is referenced from an
* L2 table). nb_clusters contains the total cluster count of the image file,
* i.e., the number of bits in expanded_clusters.
+ *
+ * l1_entries and *visited_l1_entries are used to keep track of progress for
+ * status_cb(). l1_entries contains the total number of L1 entries and
+ * *visited_l1_entries counts all visited L1 entries.
*/
static int expand_zero_clusters_in_l1(BlockDriverState *bs, uint64_t *l1_table,
int l1_size, uint8_t **expanded_clusters,
- uint64_t *nb_clusters)
+ uint64_t *nb_clusters,
+ int64_t *visited_l1_entries,
+ int64_t l1_entries,
+ BlockDriverAmendStatusCB *status_cb)
{
BDRVQcowState *s = bs->opaque;
bool is_active_l1 = (l1_table == s->l1_table);
@@ -1644,6 +1651,10 @@ static int expand_zero_clusters_in_l1(BlockDriverState
*bs, uint64_t *l1_table,
if (!l2_offset) {
/* unallocated */
+ (*visited_l1_entries)++;
+ if (status_cb) {
+ status_cb(bs, *visited_l1_entries, l1_entries);
+ }
continue;
}
@@ -1776,6 +1787,11 @@ static int expand_zero_clusters_in_l1(BlockDriverState
*bs, uint64_t *l1_table,
}
}
}
+
+ (*visited_l1_entries)++;
+ if (status_cb) {
+ status_cb(bs, *visited_l1_entries, l1_entries);
+ }
}
ret = 0;
@@ -1802,15 +1818,24 @@ fail:
* allocation for pre-allocated ones). This is important for downgrading to a
* qcow2 version which doesn't yet support metadata zero clusters.
*/
-int qcow2_expand_zero_clusters(BlockDriverState *bs)
+int qcow2_expand_zero_clusters(BlockDriverState *bs,
+ BlockDriverAmendStatusCB *status_cb)
{
BDRVQcowState *s = bs->opaque;
uint64_t *l1_table = NULL;
uint64_t nb_clusters;
+ int64_t l1_entries = 0, visited_l1_entries = 0;
uint8_t *expanded_clusters;
int ret;
int i, j;
+ if (status_cb) {
+ l1_entries = s->l1_size;
+ for (i = 0; i < s->nb_snapshots; i++) {
+ l1_entries += s->snapshots[i].l1_size;
+ }
+ }
+
nb_clusters = size_to_clusters(s, bs->file->total_sectors *
BDRV_SECTOR_SIZE);
expanded_clusters = g_try_malloc0((nb_clusters + 7) / 8);
@@ -1820,7 +1845,9 @@ int qcow2_expand_zero_clusters(BlockDriverState *bs)
}
ret = expand_zero_clusters_in_l1(bs, s->l1_table, s->l1_size,
- &expanded_clusters, &nb_clusters);
+ &expanded_clusters, &nb_clusters,
+ &visited_l1_entries, l1_entries,
+ status_cb);
if (ret < 0) {
goto fail;
}
@@ -1854,7 +1881,9 @@ int qcow2_expand_zero_clusters(BlockDriverState *bs)
}
ret = expand_zero_clusters_in_l1(bs, l1_table, s->snapshots[i].l1_size,
- &expanded_clusters, &nb_clusters);
+ &expanded_clusters, &nb_clusters,
+ &visited_l1_entries, l1_entries,
+ status_cb);
if (ret < 0) {
goto fail;
}
diff --git a/block/qcow2.c b/block/qcow2.c
index 0242793..d120494 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -2550,7 +2550,8 @@ static int qcow2_load_vmstate(BlockDriverState *bs,
uint8_t *buf,
* Downgrades an image's version. To achieve this, any incompatible features
* have to be removed.
*/
-static int qcow2_downgrade(BlockDriverState *bs, int target_version)
+static int qcow2_downgrade(BlockDriverState *bs, int target_version,
+ BlockDriverAmendStatusCB *status_cb)
{
BDRVQcowState *s = bs->opaque;
int current_version = s->qcow_version;
@@ -2599,7 +2600,7 @@ static int qcow2_downgrade(BlockDriverState *bs, int
target_version)
/* clearing autoclear features is trivial */
s->autoclear_features = 0;
- ret = qcow2_expand_zero_clusters(bs);
+ ret = qcow2_expand_zero_clusters(bs, status_cb);
if (ret < 0) {
return ret;
}
@@ -2692,7 +2693,7 @@ static int qcow2_amend_options(BlockDriverState *bs,
QemuOpts *opts,
return ret;
}
} else {
- ret = qcow2_downgrade(bs, new_version);
+ ret = qcow2_downgrade(bs, new_version, status_cb);
if (ret < 0) {
return ret;
}
diff --git a/block/qcow2.h b/block/qcow2.h
index 886b25b..21ac8ce 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -537,7 +537,8 @@ int qcow2_discard_clusters(BlockDriverState *bs, uint64_t
offset,
int nb_sectors, enum qcow2_discard_type type, bool full_discard);
int qcow2_zero_clusters(BlockDriverState *bs, uint64_t offset, int nb_sectors);
-int qcow2_expand_zero_clusters(BlockDriverState *bs);
+int qcow2_expand_zero_clusters(BlockDriverState *bs,
+ BlockDriverAmendStatusCB *status_cb);
/* qcow2-snapshot.c functions */
int qcow2_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info);
--
1.9.3
- [Qemu-devel] [PULL 29/53] qemu-img: Empty image after commit, (continued)
- [Qemu-devel] [PULL 29/53] qemu-img: Empty image after commit, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 30/53] qemu-img: Enable progress output for commit, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 31/53] qemu-img: Specify backing file for commit, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 32/53] iotests: Add _filter_qemu_img_map, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 33/53] iotests: Add test for backing-chain commits, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 34/53] iotests: Add test for qcow2's bdrv_make_empty, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 36/53] block: Add status callback to bdrv_amend_options(), Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 35/53] block: qemu-iotest 107 supports NFS, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 37/53] qemu-img: Add progress output for amend, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 38/53] qemu-img: Fix insignificant memleak, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 39/53] block/qcow2: Implement status CB for amend,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 40/53] block/qcow2: Make get_refcount() global, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 41/53] block/qcow2: Simplify shared L2 handling in amend, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 42/53] iotests: Expand test 061, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 43/53] block: acquire AioContext in generic blockjob QMP commands, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 44/53] blockdev: acquire AioContext in do_qmp_query_block_jobs_one(), Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 45/53] blockdev: acquire AioContext in blockdev_mark_auto_del(), Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 46/53] blockdev: add note that block_job_cb() must be thread-safe, Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 47/53] blockjob: add block_job_defer_to_main_loop(), Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 48/53] block: add bdrv_drain(), Stefan Hajnoczi, 2014/11/03
- [Qemu-devel] [PULL 49/53] block: let backup blockjob run in BDS AioContext, Stefan Hajnoczi, 2014/11/03