[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] qcow2: Move error check of local_err near its assignment
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
Re: [PATCH] qcow2: Move error check of local_err near its assignment |
Date: |
Wed, 18 Dec 2019 09:47:44 +0000 |
18.12.2019 5:26, Tuguoyi wrote:
>
> Signed-off-by: Guoyi Tu <address@hidden>
Reviewed-by: Vladimir Sementsov-Ogievskiy <address@hidden>
> ---
> block/qcow2.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/block/qcow2.c b/block/qcow2.c
> index 7c18721..ce3db29 100644
> --- a/block/qcow2.c
> +++ b/block/qcow2.c
> @@ -1705,14 +1705,14 @@ static int coroutine_fn
> qcow2_do_open(BlockDriverState *bs, QDict *options,
> if (!(bdrv_get_flags(bs) & BDRV_O_INACTIVE)) {
> /* It's case 1, 2 or 3.2. Or 3.1 which is BUG in management layer.
> */
> bool header_updated = qcow2_load_dirty_bitmaps(bs, &local_err);
> + if (local_err != NULL) {
> + error_propagate(errp, local_err);
> + ret = -EINVAL;
> + goto fail;
> + }
>
> update_header = update_header && !header_updated;
> }
> - if (local_err != NULL) {
> - error_propagate(errp, local_err);
> - ret = -EINVAL;
> - goto fail;
> - }
>
> if (update_header) {
> ret = qcow2_update_header(bs);
>
--
Best regards,
Vladimir