From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44081) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XIFfa-0000BI-UU for qemu-devel@nongnu.org; Fri, 15 Aug 2014 07:27:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XIFfV-0006lB-Qs for qemu-devel@nongnu.org; Fri, 15 Aug 2014 07:27:42 -0400 Received: from lputeaux-656-01-25-125.w80-12.abo.wanadoo.fr ([80.12.84.125]:41847 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XIFfV-0006l7-Gh for qemu-devel@nongnu.org; Fri, 15 Aug 2014 07:27:37 -0400 Date: Fri, 15 Aug 2014 13:26:44 +0200 From: =?iso-8859-1?Q?Beno=EEt?= Canet Message-ID: <20140815112644.GC9305@irqsave.net> References: <1406936961-20356-1-git-send-email-mreitz@redhat.com> <1406936961-20356-5-git-send-email-mreitz@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1406936961-20356-5-git-send-email-mreitz@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v2 4/7] block/qcow2: Implement status CB for amend List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Max Reitz Cc: Kevin Wolf , qemu-devel@nongnu.org, Stefan Hajnoczi The Saturday 02 Aug 2014 =E0 01:49:18 (+0200), Max Reitz wrote : > 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. >=20 > For this, approximate the progress as the number of L1 entries visited > during the operation. >=20 > Signed-off-by: Max Reitz > --- > block/qcow2-cluster.c | 37 +++++++++++++++++++++++++++++++++---- > block/qcow2.c | 7 ++++--- > block/qcow2.h | 3 ++- > 3 files changed, 39 insertions(+), 8 deletions(-) >=20 > diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c > index 4208dc0..2607715 100644 > --- a/block/qcow2-cluster.c > +++ b/block/qcow2-cluster.c > @@ -1548,10 +1548,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 imag= e file, > * i.e., the number of bits in expanded_clusters. > + * > + * l1_entries and *visited_l1_entries are used to keep track of progre= ss 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 =3D bs->opaque; > bool is_active_l1 =3D (l1_table =3D=3D s->l1_table); > @@ -1571,6 +1578,10 @@ static int expand_zero_clusters_in_l1(BlockDrive= rState *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 > @@ -1703,6 +1714,11 @@ static int expand_zero_clusters_in_l1(BlockDrive= rState *bs, uint64_t *l1_table, > } > } > } > + > + (*visited_l1_entries)++; > + if (status_cb) { > + status_cb(bs, *visited_l1_entries, l1_entries); > + } > } > =20 > ret =3D 0; > @@ -1729,21 +1745,32 @@ fail: > * allocation for pre-allocated ones). This is important for downgradi= ng 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_malloc0((nb_clusters + 7) / 8); > =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; > } > @@ -1777,7 +1804,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_clust= ers); > + &expanded_clusters, &nb_clust= ers, > + &visited_l1_entries, l1_entri= es, > + status_cb); > if (ret < 0) { > goto fail; > } > diff --git a/block/qcow2.c b/block/qcow2.c > index a3a7efc..6e8c8ab 100644 > --- a/block/qcow2.c > +++ b/block/qcow2.c > @@ -2147,7 +2147,8 @@ static int qcow2_load_vmstate(BlockDriverState *b= s, uint8_t *buf, > * Downgrades an image's version. To achieve this, any incompatible fe= atures > * 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; > @@ -2196,7 +2197,7 @@ static int qcow2_downgrade(BlockDriverState *bs, = int 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; > } > @@ -2289,7 +2290,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 b49424b..1c4f9bf 100644 > --- a/block/qcow2.h > +++ b/block/qcow2.h > @@ -522,7 +522,8 @@ int qcow2_discard_clusters(BlockDriverState *bs, ui= nt64_t offset, > int nb_sectors, enum qcow2_discard_type type); > int qcow2_zero_clusters(BlockDriverState *bs, uint64_t offset, int nb_= sectors); > =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_i= nfo); > --=20 > 2.0.3 >=20 >=20 Ok it's the driver responsability to check if the callback is not null. That make sense. Reviewed-by: Beno=EEt Canet