|
 |
016a62 |
From d8de6fc3530b5cfa05485f24e14af4ce44a8b72d Mon Sep 17 00:00:00 2001
|
|
|
016a62 |
From: Max Reitz <mreitz@redhat.com>
|
|
|
016a62 |
Date: Tue, 19 Nov 2019 15:30:00 +0000
|
|
|
016a62 |
Subject: [PATCH 8/8] curl: Check curl_multi_add_handle()'s return code
|
|
|
016a62 |
MIME-Version: 1.0
|
|
|
016a62 |
Content-Type: text/plain; charset=UTF-8
|
|
|
016a62 |
Content-Transfer-Encoding: 8bit
|
|
|
016a62 |
|
|
|
016a62 |
RH-Author: Max Reitz <mreitz@redhat.com>
|
|
|
016a62 |
Message-id: <20191119153000.101646-8-mreitz@redhat.com>
|
|
|
016a62 |
Patchwork-id: 92521
|
|
|
016a62 |
O-Subject: [RHEL-8.2.0 qemu-kvm PATCH 7/7] curl: Check curl_multi_add_handle()'s return code
|
|
|
016a62 |
Bugzilla: 1744602
|
|
|
016a62 |
RH-Acked-by: Maxim Levitsky <mlevitsk@redhat.com>
|
|
|
016a62 |
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
016a62 |
RH-Acked-by: Stefano Garzarella <sgarzare@redhat.com>
|
|
|
016a62 |
|
|
|
016a62 |
If we had done that all along, debugging would have been much simpler.
|
|
|
016a62 |
(Also, I/O errors are better than hangs.)
|
|
|
016a62 |
|
|
|
016a62 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
016a62 |
Message-id: 20190910124136.10565-8-mreitz@redhat.com
|
|
|
016a62 |
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
|
|
|
016a62 |
Reviewed-by: John Snow <jsnow@redhat.com>
|
|
|
016a62 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
016a62 |
(cherry picked from commit c34dc07f9f01cf686e512f939aece744723072cd)
|
|
|
016a62 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
016a62 |
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
|
016a62 |
---
|
|
|
016a62 |
block/curl.c | 8 +++++++-
|
|
|
016a62 |
1 file changed, 7 insertions(+), 1 deletion(-)
|
|
|
016a62 |
|
|
|
016a62 |
diff --git a/block/curl.c b/block/curl.c
|
|
|
016a62 |
index b5899e1..5d05d30 100644
|
|
|
016a62 |
--- a/block/curl.c
|
|
|
016a62 |
+++ b/block/curl.c
|
|
|
016a62 |
@@ -891,7 +891,13 @@ static void curl_setup_preadv(BlockDriverState *bs, CURLAIOCB *acb)
|
|
|
016a62 |
acb->bytes, start, state->range);
|
|
|
016a62 |
curl_easy_setopt(state->curl, CURLOPT_RANGE, state->range);
|
|
|
016a62 |
|
|
|
016a62 |
- curl_multi_add_handle(s->multi, state->curl);
|
|
|
016a62 |
+ if (curl_multi_add_handle(s->multi, state->curl) != CURLM_OK) {
|
|
|
016a62 |
+ state->acb[0] = NULL;
|
|
|
016a62 |
+ acb->ret = -EIO;
|
|
|
016a62 |
+
|
|
|
016a62 |
+ curl_clean_state(state);
|
|
|
016a62 |
+ goto out;
|
|
|
016a62 |
+ }
|
|
|
016a62 |
|
|
|
016a62 |
/* Tell curl it needs to kick things off */
|
|
|
016a62 |
curl_multi_socket_action(s->multi, CURL_SOCKET_TIMEOUT, 0, &running);
|
|
|
016a62 |
--
|
|
|
016a62 |
1.8.3.1
|
|
|
016a62 |
|