From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47433) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQ0Kp-00076G-5M for qemu-devel@nongnu.org; Tue, 18 Mar 2014 16:10:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WQ0Kj-0008KA-W6 for qemu-devel@nongnu.org; Tue, 18 Mar 2014 16:10:03 -0400 Received: from lputeaux-656-01-25-125.w80-12.abo.wanadoo.fr ([80.12.84.125]:56294 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQ0Kj-0008Jr-Lk for qemu-devel@nongnu.org; Tue, 18 Mar 2014 16:09:57 -0400 Date: Tue, 18 Mar 2014 21:09:55 +0100 From: =?iso-8859-1?Q?Beno=EEt?= Canet Message-ID: <20140318200954.GA3060@irqsave.net> References: <1395153402-14807-1-git-send-email-kwolf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1395153402-14807-1-git-send-email-kwolf@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v2] block: Add error handling to bdrv_invalidate_cache() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin Wolf Cc: qemu-devel@nongnu.org, stefanha@redhat.com, quintela@redhat.com The Tuesday 18 Mar 2014 =E0 15:36:42 (+0100), Kevin Wolf wrote : > If it returns an error, the migrated VM will not be started, but qemu > exits with an error message. >=20 > Signed-off-by: Kevin Wolf > Reviewed-by: Juan Quintela > Reviewed-by: Eric Blake > --- >=20 > v2: > - Update quorum as well (not built by default, so it escaped my > attention in v1) >=20 > block.c | 28 ++++++++++++++++++++++------ > block/qcow2.c | 22 +++++++++++++++++++--- > block/qed.c | 21 ++++++++++++++++++--- > block/quorum.c | 9 +++++++-- > include/block/block.h | 4 ++-- > include/block/block_int.h | 2 +- > migration.c | 8 +++++++- > 7 files changed, 76 insertions(+), 18 deletions(-) >=20 > diff --git a/block.c b/block.c > index 53f5b44..acb70fd 100644 > --- a/block.c > +++ b/block.c > @@ -4781,27 +4781,43 @@ flush_parent: > return bdrv_co_flush(bs->file); > } > =20 > -void bdrv_invalidate_cache(BlockDriverState *bs) > +void bdrv_invalidate_cache(BlockDriverState *bs, Error **errp) > { > + Error *local_err =3D NULL; > + int ret; > + > if (!bs->drv) { > return; > } > =20 > if (bs->drv->bdrv_invalidate_cache) { > - bs->drv->bdrv_invalidate_cache(bs); > + bs->drv->bdrv_invalidate_cache(bs, &local_err); > } else if (bs->file) { > - bdrv_invalidate_cache(bs->file); > + bdrv_invalidate_cache(bs->file, &local_err); > + } > + if (local_err) { > + error_propagate(errp, local_err); > + return; > } > =20 > - refresh_total_sectors(bs, bs->total_sectors); > + ret =3D refresh_total_sectors(bs, bs->total_sectors); > + if (ret < 0) { > + error_setg_errno(errp, -ret, "Could not refresh total sector c= ount"); > + return; > + } > } > =20 > -void bdrv_invalidate_cache_all(void) > +void bdrv_invalidate_cache_all(Error **errp) > { > BlockDriverState *bs; > + Error *local_err =3D NULL; > =20 > QTAILQ_FOREACH(bs, &bdrv_states, device_list) { > - bdrv_invalidate_cache(bs); > + bdrv_invalidate_cache(bs, &local_err); > + if (local_err) { > + error_propagate(errp, local_err); > + return; > + } > } > } > =20 > diff --git a/block/qcow2.c b/block/qcow2.c > index 945c9d6..b9dc960 100644 > --- a/block/qcow2.c > +++ b/block/qcow2.c > @@ -1156,7 +1156,7 @@ static void qcow2_close(BlockDriverState *bs) > qcow2_free_snapshots(bs); > } > =20 > -static void qcow2_invalidate_cache(BlockDriverState *bs) > +static void qcow2_invalidate_cache(BlockDriverState *bs, Error **errp) > { > BDRVQcowState *s =3D bs->opaque; > int flags =3D s->flags; > @@ -1164,6 +1164,8 @@ static void qcow2_invalidate_cache(BlockDriverSta= te *bs) > AES_KEY aes_decrypt_key; > uint32_t crypt_method =3D 0; > QDict *options; > + Error *local_err =3D NULL; > + int ret; > =20 > /* > * Backing files are read-only which makes all of their metadata i= mmutable, > @@ -1178,11 +1180,25 @@ static void qcow2_invalidate_cache(BlockDriverS= tate *bs) > =20 > qcow2_close(bs); > =20 > - bdrv_invalidate_cache(bs->file); > + bdrv_invalidate_cache(bs->file, &local_err); > + if (local_err) { > + error_propagate(errp, local_err); > + return; > + } > =20 > memset(s, 0, sizeof(BDRVQcowState)); > options =3D qdict_clone_shallow(bs->options); > - qcow2_open(bs, options, flags, NULL); > + > + ret =3D qcow2_open(bs, options, flags, &local_err); > + if (local_err) { > + error_setg(errp, "Could not reopen qcow2 layer: %s", > + error_get_pretty(local_err)); > + error_free(local_err); > + return; > + } else if (ret < 0) { > + error_setg_errno(errp, -ret, "Could not reopen qcow2 layer"); > + return; > + } > =20 > QDECREF(options); > =20 > diff --git a/block/qed.c b/block/qed.c > index 837accd..3bd9db9 100644 > --- a/block/qed.c > +++ b/block/qed.c > @@ -1558,16 +1558,31 @@ static int bdrv_qed_change_backing_file(BlockDr= iverState *bs, > return ret; > } > =20 > -static void bdrv_qed_invalidate_cache(BlockDriverState *bs) > +static void bdrv_qed_invalidate_cache(BlockDriverState *bs, Error **er= rp) > { > BDRVQEDState *s =3D bs->opaque; > + Error *local_err =3D NULL; > + int ret; > =20 > bdrv_qed_close(bs); > =20 > - bdrv_invalidate_cache(bs->file); > + bdrv_invalidate_cache(bs->file, &local_err); > + if (local_err) { > + error_propagate(errp, local_err); > + return; > + } > =20 > memset(s, 0, sizeof(BDRVQEDState)); > - bdrv_qed_open(bs, NULL, bs->open_flags, NULL); > + ret =3D bdrv_qed_open(bs, NULL, bs->open_flags, &local_err); > + if (local_err) { > + error_setg(errp, "Could not reopen qed layer: %s", > + error_get_pretty(local_err)); > + error_free(local_err); > + return; > + } else if (ret < 0) { > + error_setg_errno(errp, -ret, "Could not reopen qed layer"); > + return; > + } > } > =20 > static int bdrv_qed_check(BlockDriverState *bs, BdrvCheckResult *resul= t, > diff --git a/block/quorum.c b/block/quorum.c > index 33bf2ae..7f580a8 100644 > --- a/block/quorum.c > +++ b/block/quorum.c > @@ -625,13 +625,18 @@ static int64_t quorum_getlength(BlockDriverState = *bs) > return result; > } > =20 > -static void quorum_invalidate_cache(BlockDriverState *bs) > +static void quorum_invalidate_cache(BlockDriverState *bs, Error **errp= ) > { > BDRVQuorumState *s =3D bs->opaque; > + Error *local_err =3D NULL; > int i; > =20 > for (i =3D 0; i < s->num_children; i++) { > - bdrv_invalidate_cache(s->bs[i]); > + bdrv_invalidate_cache(s->bs[i], &local_err); > + if (local_err) { > + error_propagate(errp, local_err); > + return; > + } > } > } > =20 > diff --git a/include/block/block.h b/include/block/block.h > index bd34d14..1ed55d8 100644 > --- a/include/block/block.h > +++ b/include/block/block.h > @@ -329,8 +329,8 @@ BlockDriverAIOCB *bdrv_aio_ioctl(BlockDriverState *= bs, > BlockDriverCompletionFunc *cb, void *opaque); > =20 > /* Invalidate any cached metadata used by image formats */ > -void bdrv_invalidate_cache(BlockDriverState *bs); > -void bdrv_invalidate_cache_all(void); > +void bdrv_invalidate_cache(BlockDriverState *bs, Error **errp); > +void bdrv_invalidate_cache_all(Error **errp); > =20 > void bdrv_clear_incoming_migration_all(void); > =20 > diff --git a/include/block/block_int.h b/include/block/block_int.h > index 4fc5ea8..cd5bc73 100644 > --- a/include/block/block_int.h > +++ b/include/block/block_int.h > @@ -153,7 +153,7 @@ struct BlockDriver { > /* > * Invalidate any cached meta-data. > */ > - void (*bdrv_invalidate_cache)(BlockDriverState *bs); > + void (*bdrv_invalidate_cache)(BlockDriverState *bs, Error **errp); > =20 > /* > * Flushes all data that was already written to the OS all the way= down to > diff --git a/migration.c b/migration.c > index 00f465e..e0e24d4 100644 > --- a/migration.c > +++ b/migration.c > @@ -101,6 +101,7 @@ void qemu_start_incoming_migration(const char *uri,= Error **errp) > static void process_incoming_migration_co(void *opaque) > { > QEMUFile *f =3D opaque; > + Error *local_err =3D NULL; > int ret; > =20 > ret =3D qemu_loadvm_state(f); > @@ -115,7 +116,12 @@ static void process_incoming_migration_co(void *op= aque) > =20 > bdrv_clear_incoming_migration_all(); > /* Make sure all file formats flush their mutable metadata */ > - bdrv_invalidate_cache_all(); > + bdrv_invalidate_cache_all(&local_err); > + if (local_err) { > + qerror_report_err(local_err); > + error_free(local_err); > + exit(EXIT_FAILURE); > + } > =20 > if (autostart) { > vm_start(); > --=20 > 1.8.3.1 >=20 Look good Reviewed-by: Benoit Canet