On 3/11/19 11:50 AM, Kevin Wolf wrote: > Signed-off-by: Kevin Wolf <kw...@redhat.com> > --- > block.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) >
Reviewed-by: Eric Blake <ebl...@redhat.com>
> diff --git a/block.c b/block.c
> index ccf008c177..e18bd5eefd 100644
> --- a/block.c
> +++ b/block.c
> @@ -3155,14 +3155,12 @@ int bdrv_reopen_multiple(AioContext *ctx,
> BlockReopenQueue *bs_queue, Error **er
> {
> int ret = -1;
> BlockReopenQueueEntry *bs_entry, *next;
> - Error *local_err = NULL;
>
> assert(bs_queue != NULL);
>
> QSIMPLEQ_FOREACH(bs_entry, bs_queue, entry) {
> assert(bs_entry->state.bs->quiesce_counter > 0);
> - if (bdrv_reopen_prepare(&bs_entry->state, bs_queue, &local_err)) {
> - error_propagate(errp, local_err);
> + if (bdrv_reopen_prepare(&bs_entry->state, bs_queue, errp)) {
> goto cleanup;
> }
> bs_entry->prepared = true;
>
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3226
Virtualization: qemu.org | libvirt.org
signature.asc
Description: OpenPGP digital signature
