openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

block/nbd-client: save first fatal error in nbd_iter_error 

It is ok, that fatal error hides previous not fatal, but hiding
first fatal error is a bad feature.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20180312152126.286890-5-vsementsov@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2018-03-12 18:21:22 +03:00 committed by Eric Blake
parent e7b1948d51
commit 1e98efc029
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
block/nbd-client.c
View File

@ -481,6 +481,7 @@ static coroutine_fn int nbd_co_receive_one_chunk(
typedef struct NBDReplyChunkIter { typedef struct NBDReplyChunkIter {
int ret; int ret;
bool fatal;
Error *err; Error *err;
bool done, only_structured; bool done, only_structured;
} NBDReplyChunkIter; } NBDReplyChunkIter;
@ -490,11 +491,12 @@ static void nbd_iter_error(NBDReplyChunkIter *iter, bool fatal,
{ {
assert(ret < 0); assert(ret < 0);
if (fatal || iter->ret == 0) { if ((fatal && !iter->fatal) || iter->ret == 0) {
if (iter->ret != 0) { if (iter->ret != 0) {
error_free(iter->err); error_free(iter->err);
iter->err = NULL; iter->err = NULL;
} }
iter->fatal = fatal;
iter->ret = ret; iter->ret = ret;
error_propagate(&iter->err, *local_err); error_propagate(&iter->err, *local_err);
} else { } else {