diff options
| author | Vladimir Sementsov-Ogievskiy | 2021-02-02 13:49:44 +0100 |
|---|---|---|
| committer | Eric Blake | 2021-02-12 22:39:44 +0100 |
| commit | 934aee14d36e67468260635af61c387227cdaf78 (patch) | |
| tree | baa87d2a9264822f6fe7ebcd71f5523ff989a9df /blockdev.c | |
| parent | block: return status from bdrv_append and friends (diff) | |
| download | qemu-934aee14d36e67468260635af61c387227cdaf78.tar.gz qemu-934aee14d36e67468260635af61c387227cdaf78.tar.xz qemu-934aee14d36e67468260635af61c387227cdaf78.zip | |
block: use return status of bdrv_append()
Now bdrv_append returns status and we can drop all the local_err things
around it.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Message-Id: <20210202124956.63146-3-vsementsov@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'blockdev.c')
| -rw-r--r-- | blockdev.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/blockdev.c b/blockdev.c index b250b9b959..cd438e60e3 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1432,6 +1432,7 @@ typedef struct ExternalSnapshotState { static void external_snapshot_prepare(BlkActionState *common, Error **errp) { + int ret; int flags = 0; QDict *options = NULL; Error *local_err = NULL; @@ -1591,9 +1592,8 @@ static void external_snapshot_prepare(BlkActionState *common, * can fail, so we need to do it in .prepare; undoing it for abort is * always possible. */ bdrv_ref(state->new_bs); - bdrv_append(state->new_bs, state->old_bs, &local_err); - if (local_err) { - error_propagate(errp, local_err); + ret = bdrv_append(state->new_bs, state->old_bs, errp); + if (ret < 0) { goto out; } state->overlay_appended = true; |