Commit c34dc07f authored by Max Reitz's avatar Max Reitz
Browse files

curl: Check curl_multi_add_handle()'s return code 



If we had done that all along, debugging would have been much simpler.
(Also, I/O errors are better than hangs.)

Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
Message-id: 20190910124136.10565-8-mreitz@redhat.com
Reviewed-by: default avatarMaxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: default avatarJohn Snow <jsnow@redhat.com>
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent bfb23b48

block/curl.c

+7 −1
Original line number Diff line number Diff line
@@ -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);