[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 12/16] curl: Check curl_multi_add_handle()'s return c
From: |
Max Reitz |
Subject: |
[Qemu-block] [PULL 12/16] curl: Check curl_multi_add_handle()'s return code |
Date: |
Mon, 16 Sep 2019 16:22:42 +0200 |
If we had done that all along, debugging would have been much simpler.
(Also, I/O errors are better than hangs.)
Signed-off-by: Max Reitz <address@hidden>
Message-id: address@hidden
Reviewed-by: Maxim Levitsky <address@hidden>
Reviewed-by: John Snow <address@hidden>
Signed-off-by: Max Reitz <address@hidden>
---
block/curl.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/block/curl.c b/block/curl.c
index c343c7ed3d..f86299378e 100644
--- a/block/curl.c
+++ b/block/curl.c
@@ -882,7 +882,13 @@ static void curl_setup_preadv(BlockDriverState *bs,
CURLAIOCB *acb)
trace_curl_setup_preadv(acb->bytes, start, state->range);
curl_easy_setopt(state->curl, CURLOPT_RANGE, state->range);
- curl_multi_add_handle(s->multi, state->curl);
+ if (curl_multi_add_handle(s->multi, state->curl) != CURLM_OK) {
+ state->acb[0] = NULL;
+ acb->ret = -EIO;
+
+ curl_clean_state(state);
+ goto out;
+ }
/* Tell curl it needs to kick things off */
curl_multi_socket_action(s->multi, CURL_SOCKET_TIMEOUT, 0, &running);
--
2.21.0
- [Qemu-block] [PULL 02/16] block: Remove unused masks, (continued)
- [Qemu-block] [PULL 02/16] block: Remove unused masks, Max Reitz, 2019/09/16
- [Qemu-block] [PULL 03/16] tests/qemu-iotests/check: Replace "tests" with "iotests" in final status text, Max Reitz, 2019/09/16
- [Qemu-block] [PULL 04/16] tests/Makefile: Do not print the name of the check-block.sh shell script, Max Reitz, 2019/09/16
- [Qemu-block] [PULL 06/16] curl: Keep pointer to the CURLState in CURLSocket, Max Reitz, 2019/09/16
- [Qemu-block] [PULL 05/16] tests/qemu-iotests: Fix qemu-io related output in 026.out.nocache, Max Reitz, 2019/09/16
- [Qemu-block] [PULL 07/16] curl: Keep *socket until the end of curl_sock_cb(), Max Reitz, 2019/09/16
- [Qemu-block] [PULL 08/16] curl: Check completion in curl_multi_do(), Max Reitz, 2019/09/16
- [Qemu-block] [PULL 09/16] curl: Pass CURLSocket to curl_multi_do(), Max Reitz, 2019/09/16
- [Qemu-block] [PULL 10/16] curl: Report only ready sockets, Max Reitz, 2019/09/16
- [Qemu-block] [PULL 11/16] curl: Handle success in multi_check_completion, Max Reitz, 2019/09/16
- [Qemu-block] [PULL 12/16] curl: Check curl_multi_add_handle()'s return code,
Max Reitz <=
- [Qemu-block] [PULL 13/16] blockjob: update nodes head while removing all bdrv, Max Reitz, 2019/09/16
- [Qemu-block] [PULL 14/16] block/qcow2: Fix corruption introduced by commit 8ac0f15f335, Max Reitz, 2019/09/16
- [Qemu-block] [PULL 15/16] block/qcow2: refactor encryption code, Max Reitz, 2019/09/16
- [Qemu-block] [PULL 16/16] qemu-iotests: Add test for bz #1745922, Max Reitz, 2019/09/16
- Re: [Qemu-block] [Qemu-devel] [PULL 00/16] Block patches, no-reply, 2019/09/16
- Re: [Qemu-block] [PULL 00/16] Block patches, Peter Maydell, 2019/09/17