[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v2 4/8] block/nbd-client: save first fatal error in
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-block] [PATCH v2 4/8] block/nbd-client: save first fatal error in nbd_iter_error |
Date: |
Mon, 12 Mar 2018 18:21:22 +0300 |
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 <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
v2: add Eric's r-b
block/nbd-client.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/block/nbd-client.c b/block/nbd-client.c
index 7b68499b76..0d9f73a137 100644
--- a/block/nbd-client.c
+++ b/block/nbd-client.c
@@ -481,6 +481,7 @@ static coroutine_fn int nbd_co_receive_one_chunk(
typedef struct NBDReplyChunkIter {
int ret;
+ bool fatal;
Error *err;
bool done, only_structured;
} NBDReplyChunkIter;
@@ -490,11 +491,12 @@ static void nbd_iter_error(NBDReplyChunkIter *iter, bool
fatal,
{
assert(ret < 0);
- if (fatal || iter->ret == 0) {
+ if ((fatal && !iter->fatal) || iter->ret == 0) {
if (iter->ret != 0) {
error_free(iter->err);
iter->err = NULL;
}
+ iter->fatal = fatal;
iter->ret = ret;
error_propagate(&iter->err, *local_err);
} else {
--
2.11.1
- [Qemu-block] [PATCH v2 0/8] nbd block status base:allocation, Vladimir Sementsov-Ogievskiy, 2018/03/12
- [Qemu-block] [PATCH v2 7/8] iotests: add file_path helper, Vladimir Sementsov-Ogievskiy, 2018/03/12
- [Qemu-block] [PATCH v2 4/8] block/nbd-client: save first fatal error in nbd_iter_error,
Vladimir Sementsov-Ogievskiy <=
- [Qemu-block] [PATCH v2 2/8] nbd/server: add nbd_read_opt_name helper, Vladimir Sementsov-Ogievskiy, 2018/03/12
- [Qemu-block] [PATCH v2 8/8] iotests: new test 209 for NBD BLOCK_STATUS, Vladimir Sementsov-Ogievskiy, 2018/03/12
- [Qemu-block] [PATCH v2 5/8] nbd: BLOCK_STATUS for standard get_block_status function: client part, Vladimir Sementsov-Ogievskiy, 2018/03/12
- [Qemu-block] [PATCH v2 6/8] iotests.py: tiny refactor: move system imports up, Vladimir Sementsov-Ogievskiy, 2018/03/12
- [Qemu-block] [PATCH v2 1/8] nbd/server: add nbd_opt_invalid helper, Vladimir Sementsov-Ogievskiy, 2018/03/12
- [Qemu-block] [PATCH v2 3/8] nbd: BLOCK_STATUS for standard get_block_status function: server part, Vladimir Sementsov-Ogievskiy, 2018/03/12