From 21dbedae8100710d284b79f7ce21a6b095a4c6e0 Mon Sep 17 00:00:00 2001

From: Max Reitz <mreitz@redhat.com>

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

Subject: [PATCH 2/8] curl: Keep pointer to the CURLState in CURLSocket

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

Patchwork-id: 92515

O-Subject: [RHEL-8.2.0 qemu-kvm PATCH 1/7] curl: Keep pointer to the CURLState in CURLSocket

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>

A follow-up patch will make curl_multi_do() and curl_multi_read() take a

CURLSocket instead of the CURLState.  They still need the latter,

though, so add a pointer to it to the former.

Cc: qemu-stable@nongnu.org

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

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

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

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

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

(cherry picked from commit 0487861685294660b23bc146e1ebd5304aa8bbe0)

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

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

---

 block/curl.c | 3 +++

 1 file changed, 3 insertions(+)

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

index f0df33a..fa602d1 100644

--- a/block/curl.c

+++ b/block/curl.c

@@ -89,6 +89,7 @@ static CURLMcode __curl_multi_socket_action(CURLM *multi_handle,

 #define CURL_BLOCK_OPT_PROXY_PASSWORD_SECRET "proxy-password-secret"

 struct BDRVCURLState;

+struct CURLState;

 static bool libcurl_initialized;

@@ -106,6 +107,7 @@ typedef struct CURLAIOCB {

 typedef struct CURLSocket {

     int fd;

+    struct CURLState *state;

     QLIST_ENTRY(CURLSocket) next;

 } CURLSocket;

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

     if (!socket) {

         socket = g_new0(CURLSocket, 1);

         socket->fd = fd;

+        socket->state = state;

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

     }

     socket = NULL;

-- 

1.8.3.1