From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>
Subject: [Qemu-devel] [PATCH 1/6] curl: Keep pointer to the CURLState in CURLSocket
Date: Tue, 27 Aug 2019 18:34:34 +0200 [thread overview]
Message-ID: <20190827163439.16686-2-mreitz@redhat.com> (raw)
In-Reply-To: <20190827163439.16686-1-mreitz@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>
---
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 *multi_handle,
#define CURL_BLOCK_OPT_TIMEOUT_DEFAULT 5
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 action,
if (!socket) {
socket = g_new0(CURLSocket, 1);
socket->fd = fd;
+ socket->state = state;
QLIST_INSERT_HEAD(&state->sockets, socket, next);
}
socket = NULL;
--
2.21.0
next prev parent reply other threads:[~2019-08-27 16:36 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-27 16:34 [Qemu-devel] [PATCH 0/6] block/curl: Fix hang and potential crash Max Reitz
2019-08-27 16:34 ` Max Reitz [this message]
2019-09-09 20:05 ` [Qemu-devel] [Qemu-block] [PATCH 1/6] curl: Keep pointer to the CURLState in CURLSocket John Snow
2019-08-27 16:34 ` [Qemu-devel] [PATCH 2/6] curl: Keep *socket until the end of curl_sock_cb() Max Reitz
2019-09-09 20:09 ` [Qemu-devel] [Qemu-block] " John Snow
2019-09-10 7:50 ` Max Reitz
2019-08-27 16:34 ` [Qemu-devel] [PATCH 3/6] curl: Pass CURLSocket to curl_multi_{do, read}() Max Reitz
2019-09-09 20:10 ` [Qemu-devel] [Qemu-block] " John Snow
2019-09-10 7:52 ` Max Reitz
2019-08-27 16:34 ` [Qemu-devel] [PATCH 4/6] curl: Report only ready sockets Max Reitz
2019-09-09 20:16 ` [Qemu-devel] [Qemu-block] " John Snow
2019-09-10 7:53 ` Max Reitz
2019-08-27 16:34 ` [Qemu-devel] [PATCH 5/6] curl: Handle success in multi_check_completion Max Reitz
2019-09-09 20:30 ` [Qemu-devel] [Qemu-block] " John Snow
2019-09-10 8:17 ` Max Reitz
2019-08-27 16:34 ` [Qemu-devel] [PATCH 6/6] curl: Check curl_multi_add_handle()'s return code Max Reitz
2019-09-09 20:32 ` [Qemu-devel] [Qemu-block] " John Snow
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190827163439.16686-2-mreitz@redhat.com \
--to=mreitz@redhat.com \
--cc=kwolf@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).