From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38025) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XlGBh-000693-It for qemu-devel@nongnu.org; Mon, 03 Nov 2014 06:52:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XlGBc-0000om-LI for qemu-devel@nongnu.org; Mon, 03 Nov 2014 06:52:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41634) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XlGBc-0000og-DR for qemu-devel@nongnu.org; Mon, 03 Nov 2014 06:52:40 -0500 From: Stefan Hajnoczi Date: Mon, 3 Nov 2014 11:50:42 +0000 Message-Id: <1415015456-25086-40-git-send-email-stefanha@redhat.com> In-Reply-To: <1415015456-25086-1-git-send-email-stefanha@redhat.com> References: <1415015456-25086-1-git-send-email-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 39/53] block/qcow2: Implement status CB for amend List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Stefan Hajnoczi , Max Reitz From: Max Reitz The only really time-consuming operation potentially performed by qcow2_amend_options() is zero cluster expansion when downgrading qcow2 images from compat=3D1.1 to compat=3D0.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 Reviewed-by: Eric Blake Reviewed-by: Beno=C3=AEt Canet Reviewed-by: Kevin Wolf Reviewed-by: Benoit Canet Message-id: 1414404776-4919-5-git-send-email-mreitz@redhat.com Signed-off-by: Stefan Hajnoczi --- 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 f= rom 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_cl= usters, - uint64_t *nb_clusters) + uint64_t *nb_clusters, + int64_t *visited_l1_entries, + int64_t l1_entries, + BlockDriverAmendStatusCB *status_c= b) { BDRVQcowState *s =3D bs->opaque; bool is_active_l1 =3D (l1_table =3D=3D s->l1_table); @@ -1644,6 +1651,10 @@ static int expand_zero_clusters_in_l1(BlockDriverS= tate *bs, uint64_t *l1_table, =20 if (!l2_offset) { /* unallocated */ + (*visited_l1_entries)++; + if (status_cb) { + status_cb(bs, *visited_l1_entries, l1_entries); + } continue; } =20 @@ -1776,6 +1787,11 @@ static int expand_zero_clusters_in_l1(BlockDriverS= tate *bs, uint64_t *l1_table, } } } + + (*visited_l1_entries)++; + if (status_cb) { + status_cb(bs, *visited_l1_entries, l1_entries); + } } =20 ret =3D 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 =3D bs->opaque; uint64_t *l1_table =3D NULL; uint64_t nb_clusters; + int64_t l1_entries =3D 0, visited_l1_entries =3D 0; uint8_t *expanded_clusters; int ret; int i, j; =20 + if (status_cb) { + l1_entries =3D s->l1_size; + for (i =3D 0; i < s->nb_snapshots; i++) { + l1_entries +=3D s->snapshots[i].l1_size; + } + } + nb_clusters =3D size_to_clusters(s, bs->file->total_sectors * BDRV_SECTOR_SIZE); expanded_clusters =3D g_try_malloc0((nb_clusters + 7) / 8); @@ -1820,7 +1845,9 @@ int qcow2_expand_zero_clusters(BlockDriverState *bs= ) } =20 ret =3D 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= ) } =20 ret =3D expand_zero_clusters_in_l1(bs, l1_table, s->snapshots[i]= .l1_size, - &expanded_clusters, &nb_cluster= s); + &expanded_clusters, &nb_cluster= s, + &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 feat= ures * 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 =3D bs->opaque; int current_version =3D s->qcow_version; @@ -2599,7 +2600,7 @@ static int qcow2_downgrade(BlockDriverState *bs, in= t target_version) /* clearing autoclear features is trivial */ s->autoclear_features =3D 0; =20 - ret =3D qcow2_expand_zero_clusters(bs); + ret =3D 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 =3D qcow2_downgrade(bs, new_version); + ret =3D 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, uint= 64_t offset, int nb_sectors, enum qcow2_discard_type type, bool full_discard); int qcow2_zero_clusters(BlockDriverState *bs, uint64_t offset, int nb_se= ctors); =20 -int qcow2_expand_zero_clusters(BlockDriverState *bs); +int qcow2_expand_zero_clusters(BlockDriverState *bs, + BlockDriverAmendStatusCB *status_cb); =20 /* qcow2-snapshot.c functions */ int qcow2_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_inf= o); --=20 1.9.3