From a09766bbc8a4208fc0f62904cebec4022beba6b0 Mon Sep 17 00:00:00 2001

From: Max Reitz <mreitz@redhat.com>

Date: Tue, 19 Nov 2019 15:29:56 +0000

Subject: [PATCH 4/8] curl: Check completion in curl_multi_do()

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

RH-Author: Max Reitz <mreitz@redhat.com>

Message-id: <20191119153000.101646-4-mreitz@redhat.com>

Patchwork-id: 92516

O-Subject: [RHEL-8.2.0 qemu-kvm PATCH 3/7] curl: Check completion in curl_multi_do()

Bugzilla: 1744602

RH-Acked-by: Maxim Levitsky <mlevitsk@redhat.com>

RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>

RH-Acked-by: Stefano Garzarella <sgarzare@redhat.com>

While it is more likely that transfers complete after some file

descriptor has data ready to read, we probably should not rely on it.

Better be safe than sorry and call curl_multi_check_completion() in

curl_multi_do(), too, just like it is done in curl_multi_read().

With this change, curl_multi_do() and curl_multi_read() are actually the

same, so drop curl_multi_read() and use curl_multi_do() as the sole FD

handler.

Signed-off-by: Max Reitz <mreitz@redhat.com>

Message-id: 20190910124136.10565-4-mreitz@redhat.com

Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>

Reviewed-by: John Snow <jsnow@redhat.com>

Signed-off-by: Max Reitz <mreitz@redhat.com>

(cherry picked from commit 948403bcb1c7e71dcbe8ab8479cf3934a0efcbb5)

Signed-off-by: Max Reitz <mreitz@redhat.com>

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 block/curl.c | 14 ++------------

 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/block/curl.c b/block/curl.c

index b3fe09f..8f31594 100644

--- a/block/curl.c

+++ b/block/curl.c

@@ -148,7 +148,6 @@ typedef struct BDRVCURLState {

 static void curl_clean_state(CURLState *s);

 static void curl_multi_do(void *arg);

-static void curl_multi_read(void *arg);

 #ifdef NEED_CURL_TIMER_CALLBACK

 /* Called from curl_multi_do_locked, with s->mutex held.  */

@@ -195,7 +194,7 @@ static int curl_sock_cb(CURL *curl, curl_socket_t fd, int action,

     switch (action) {

         case CURL_POLL_IN:

             aio_set_fd_handler(s->aio_context, fd, false,

-                               curl_multi_read, NULL, NULL, state);

+                               curl_multi_do, NULL, NULL, state);

             break;

         case CURL_POLL_OUT:

             aio_set_fd_handler(s->aio_context, fd, false,

@@ -203,7 +202,7 @@ static int curl_sock_cb(CURL *curl, curl_socket_t fd, int action,

             break;

         case CURL_POLL_INOUT:

             aio_set_fd_handler(s->aio_context, fd, false,

-                               curl_multi_read, curl_multi_do, NULL, state);

+                               curl_multi_do, curl_multi_do, NULL, state);

             break;

         case CURL_POLL_REMOVE:

             aio_set_fd_handler(s->aio_context, fd, false,

@@ -427,15 +426,6 @@ static void curl_multi_do(void *arg)

     qemu_mutex_lock(&s->s->mutex);

     curl_multi_do_locked(s);

-    qemu_mutex_unlock(&s->s->mutex);

-}

-

-static void curl_multi_read(void *arg)

-{

-    CURLState *s = (CURLState *)arg;

-

-    qemu_mutex_lock(&s->s->mutex);

-    curl_multi_do_locked(s);

     curl_multi_check_completion(s->s);

     qemu_mutex_unlock(&s->s->mutex);

 }

-- 

1.8.3.1