diff options
| author | Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> | 2021-02-02 15:49:47 +0300 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2021-03-08 15:14:13 -0600 |
| commit | dc9c10a1f42235a7f8411feca28984c4e7da3177 (patch) | |
| tree | 180f49a2d3512b75e95f302a1ab2e345963f9d83 | |
| parent | 5a11a1ca0d0ed5be52070f1da8de89ef85941183 (diff) | |
| download | focaccia-qemu-dc9c10a1f42235a7f8411feca28984c4e7da3177.tar.gz focaccia-qemu-dc9c10a1f42235a7f8411feca28984c4e7da3177.zip | |
block: drop extra error propagation for bdrv_set_backing_hd
bdrv_set_backing_hd now returns status, let's use it. Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Reviewed-by: Greg Kurz <groug@kaod.org> Reviewed-by: Alberto Garcia <berto@igalia.com> Message-Id: <20210202124956.63146-6-vsementsov@virtuozzo.com> Signed-off-by: Eric Blake <eblake@redhat.com>
| -rw-r--r-- | block.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/block.c b/block.c index a1f3cecd75..933ff49b10 100644 --- a/block.c +++ b/block.c @@ -2995,11 +2995,9 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *parent_options, /* Hook up the backing file link; drop our reference, bs owns the * backing_hd reference now */ - bdrv_set_backing_hd(bs, backing_hd, &local_err); + ret = bdrv_set_backing_hd(bs, backing_hd, errp); bdrv_unref(backing_hd); - if (local_err) { - error_propagate(errp, local_err); - ret = -EINVAL; + if (ret < 0) { goto free_exit; } |