| Message ID | 20201209164441.867945-3-mlevitsk@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | qcow2: don't leave partially initialized file on image creation | expand |
On Wed 09 Dec 2020 05:44:39 PM CET, Maxim Levitsky wrote: > +void coroutine_fn bdrv_co_delete_file_noerr(BlockDriverState *bs) > +{ > + Error *local_err = NULL; > + > + if (!bs) { > + return; > + } > + > + int ret = bdrv_co_delete_file(bs, &local_err); ^^^ According to the QEMU coding style we should not have declarations in the middle of a block. The patch looks otherwise fine. Reviewed-by: Alberto Garcia <berto@igalia.com> Berto
On Wed, 2020-12-09 at 18:34 +0100, Alberto Garcia wrote: > On Wed 09 Dec 2020 05:44:39 PM CET, Maxim Levitsky wrote: > > +void coroutine_fn bdrv_co_delete_file_noerr(BlockDriverState *bs) > > +{ > > + Error *local_err = NULL; > > + > > + if (!bs) { > > + return; > > + } > > + > > + int ret = bdrv_co_delete_file(bs, &local_err); > ^^^ > > According to the QEMU coding style we should not have declarations in > the middle of a block. Oops! I will send next version now. Thanks a lot for the review! Best regards, Maxim Levitsky > > The patch looks otherwise fine. > > Reviewed-by: Alberto Garcia <berto@igalia.com> > > Berto >
diff --git a/block.c b/block.c index f1cedac362..57e6d9750a 100644 --- a/block.c +++ b/block.c @@ -704,6 +704,29 @@ int coroutine_fn bdrv_co_delete_file(BlockDriverState *bs, Error **errp) return ret; } +void coroutine_fn bdrv_co_delete_file_noerr(BlockDriverState *bs) +{ + Error *local_err = NULL; + + if (!bs) { + return; + } + + int ret = bdrv_co_delete_file(bs, &local_err); + /* + * ENOTSUP will happen if the block driver doesn't support + * the 'bdrv_co_delete_file' interface. This is a predictable + * scenario and shouldn't be reported back to the user. + */ + if (ret == -ENOTSUP) { + error_free(local_err); + } else if (ret < 0) { + error_report_err(local_err); + } +} + + + /** * Try to get @bs's logical and physical block size. * On success, store them in @bsz struct and return 0. diff --git a/include/block/block.h b/include/block/block.h index c9d7c58765..af03022723 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -428,6 +428,7 @@ int bdrv_freeze_backing_chain(BlockDriverState *bs, BlockDriverState *base, Error **errp); void bdrv_unfreeze_backing_chain(BlockDriverState *bs, BlockDriverState *base); int coroutine_fn bdrv_co_delete_file(BlockDriverState *bs, Error **errp); +void coroutine_fn bdrv_co_delete_file_noerr(BlockDriverState *bs); typedef struct BdrvCheckResult {
This function wraps bdrv_co_delete_file for the common case of removing a file, which was just created by format driver, on an error condition. It hides the -ENOTSUPP error, and reports all other errors otherwise. Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com> --- block.c | 23 +++++++++++++++++++++++ include/block/block.h | 1 + 2 files changed, 24 insertions(+)