From 46598620c18de69d9565e662a47d2615984cc49b Mon Sep 17 00:00:00 2001

From: Max Reitz <mreitz@redhat.com>

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

Subject: [PATCH 3/8] curl: Keep *socket until the end of curl_sock_cb()

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-3-mreitz@redhat.com>

Patchwork-id: 92517

O-Subject: [RHEL-8.2.0 qemu-kvm PATCH 2/7] curl: Keep *socket until the end of curl_sock_cb()

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>

This does not really change anything, but it makes the code a bit easier

to follow once we use @socket as the opaque pointer for

aio_set_fd_handler().

Cc: qemu-stable@nongnu.org

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

Message-id: 20190910124136.10565-3-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 007f339b1099af46a008dac438ca0943e31dba72)

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

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

---

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

 1 file changed, 5 insertions(+), 5 deletions(-)

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

index fa602d1..b3fe09f 100644

--- a/block/curl.c

+++ b/block/curl.c

@@ -181,10 +181,6 @@ static int curl_sock_cb(CURL *curl, curl_socket_t fd, int action,

     QLIST_FOREACH(socket, &state->sockets, next) {

         if (socket->fd == fd) {

-            if (action == CURL_POLL_REMOVE) {

-                QLIST_REMOVE(socket, next);

-                g_free(socket);

-            }

             break;

         }

     }

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

         socket->state = state;

         QLIST_INSERT_HEAD(&state->sockets, socket, next);

     }

-    socket = NULL;

     DPRINTF("CURL (AIO): Sock action %d on fd %d\n", action, (int)fd);

     switch (action) {

@@ -216,6 +211,11 @@ static int curl_sock_cb(CURL *curl, curl_socket_t fd, int action,

             break;

     }

+    if (action == CURL_POLL_REMOVE) {

+        QLIST_REMOVE(socket, next);

+        g_free(socket);

+    }

+

     return 0;

 }

-- 

1.8.3.1