qcow2: Move error check of local_err near its assignment
The local_err check outside of the if block was necessary when it was introduced in commitd1258dd0c8
because it needed to be executed even if qcow2_load_autoloading_dirty_bitmaps() returned false. After some modifications that all required the error check to remain where it is, commit9c98f145df
finally moved the qcow2_load_dirty_bitmaps() call into the if block, so now the error check should be there, too. Signed-off-by: Guoyi Tu <tu.guoyi@h3c.com> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
parent
eb4ea9aaa0
commit
66be5c3e78
@ -1705,15 +1705,15 @@ 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);
|
||||
|
||||
update_header = update_header && !header_updated;
|
||||
}
|
||||
if (local_err != NULL) {
|
||||
error_propagate(errp, local_err);
|
||||
ret = -EINVAL;
|
||||
goto fail;
|
||||
}
|
||||
|
||||
update_header = update_header && !header_updated;
|
||||
}
|
||||
|
||||
if (update_header) {
|
||||
ret = qcow2_update_header(bs);
|
||||
if (ret < 0) {
|
||||
|
Loading…
Reference in New Issue
Block a user