|
 |
7711c0 |
From 6e21eb2623d4103257fc9d849a639eb70ae20920 Mon Sep 17 00:00:00 2001
|
|
|
7711c0 |
From: Kevin Wolf <kwolf@redhat.com>
|
|
|
7711c0 |
Date: Fri, 15 Mar 2019 18:09:58 +0100
|
|
|
7711c0 |
Subject: [PATCH 002/163] block: Avoid useless local_err
|
|
|
7711c0 |
|
|
|
7711c0 |
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
|
|
7711c0 |
Message-id: <20190315181010.14964-3-kwolf@redhat.com>
|
|
|
7711c0 |
Patchwork-id: 84879
|
|
|
7711c0 |
O-Subject: [RHEL-7.7 qemu-kvm-rhev PATCH 02/14] block: Avoid useless local_err
|
|
|
7711c0 |
Bugzilla: 1685989
|
|
|
7711c0 |
RH-Acked-by: John Snow <jsnow@redhat.com>
|
|
|
7711c0 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
7711c0 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
7711c0 |
|
|
|
7711c0 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
7711c0 |
Reviewed-by: Alberto Garcia <berto@igalia.com>
|
|
|
7711c0 |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
7711c0 |
(cherry picked from commit a4615ab31cade201641cbb17a81dcac1b3bea624)
|
|
|
7711c0 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
7711c0 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
7711c0 |
---
|
|
|
7711c0 |
block.c | 4 +---
|
|
|
7711c0 |
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
|
7711c0 |
|
|
|
7711c0 |
diff --git a/block.c b/block.c
|
|
|
7711c0 |
index c47e5b0..ccf9acb 100644
|
|
|
7711c0 |
--- a/block.c
|
|
|
7711c0 |
+++ b/block.c
|
|
|
7711c0 |
@@ -3061,14 +3061,12 @@ int bdrv_reopen_multiple(AioContext *ctx, BlockReopenQueue *bs_queue, Error **er
|
|
|
7711c0 |
{
|
|
|
7711c0 |
int ret = -1;
|
|
|
7711c0 |
BlockReopenQueueEntry *bs_entry, *next;
|
|
|
7711c0 |
- Error *local_err = NULL;
|
|
|
7711c0 |
|
|
|
7711c0 |
assert(bs_queue != NULL);
|
|
|
7711c0 |
|
|
|
7711c0 |
QSIMPLEQ_FOREACH(bs_entry, bs_queue, entry) {
|
|
|
7711c0 |
assert(bs_entry->state.bs->quiesce_counter > 0);
|
|
|
7711c0 |
- if (bdrv_reopen_prepare(&bs_entry->state, bs_queue, &local_err)) {
|
|
|
7711c0 |
- error_propagate(errp, local_err);
|
|
|
7711c0 |
+ if (bdrv_reopen_prepare(&bs_entry->state, bs_queue, errp)) {
|
|
|
7711c0 |
goto cleanup;
|
|
|
7711c0 |
}
|
|
|
7711c0 |
bs_entry->prepared = true;
|
|
|
7711c0 |
--
|
|
|
7711c0 |
1.8.3.1
|
|
|
7711c0 |
|