[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[qemu-xen staging-4.13] curl: Keep pointer to the CURLState in CURLSocket

commit 3648493495f2ecb2df22aa4be396e00077693d79
Author:     Max Reitz <mreitz@xxxxxxxxxx>
AuthorDate: Tue Sep 10 14:41:30 2019 +0200
Commit:     Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
CommitDate: Wed Oct 30 11:34:26 2019 -0500

    curl: Keep pointer to the CURLState in CURLSocket
    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@xxxxxxxxxx
    Signed-off-by: Max Reitz <mreitz@xxxxxxxxxx>
    Reviewed-by: John Snow <jsnow@xxxxxxxxxx>
    Message-id: 20190910124136.10565-2-mreitz@xxxxxxxxxx
    Reviewed-by: Maxim Levitsky <mlevitsk@xxxxxxxxxx>
    Signed-off-by: Max Reitz <mreitz@xxxxxxxxxx>
    (cherry picked from commit 0487861685294660b23bc146e1ebd5304aa8bbe0)
    Signed-off-by: Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
 block/curl.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/block/curl.c b/block/curl.c
index d4c8e94f3e..92dc2f630e 100644
--- a/block/curl.c
+++ b/block/curl.c
@@ -80,6 +80,7 @@ static CURLMcode __curl_multi_socket_action(CURLM 
 struct BDRVCURLState;
+struct CURLState;
 static bool libcurl_initialized;
@@ -97,6 +98,7 @@ typedef struct CURLAIOCB {
 typedef struct CURLSocket {
     int fd;
+    struct CURLState *state;
     QLIST_ENTRY(CURLSocket) next;
 } CURLSocket;
@@ -180,6 +182,7 @@ static int curl_sock_cb(CURL *curl, curl_socket_t fd, int 
     if (!socket) {
         socket = g_new0(CURLSocket, 1);
         socket->fd = fd;
+        socket->state = state;
         QLIST_INSERT_HEAD(&state->sockets, socket, next);
     socket = NULL;
generated by git-patchbot for /home/xen/git/qemu-xen.git#staging-4.13



Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.