aboutsummaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorMax Reitz <mreitz@redhat.com>2021-03-09 14:05:40 +0100
committerKevin Wolf <kwolf@redhat.com>2021-03-19 10:15:06 +0100
commit3663dca461131f7c8e58737feba8638e064bb5d4 (patch)
tree3879ce06ebb0e2f618a9b975c7d2eec7e85639aa /block
parent1bf26076d677f693dd99a6e8ef2eca69b842d873 (diff)
downloadqemu-3663dca461131f7c8e58737feba8638e064bb5d4.zip
qemu-3663dca461131f7c8e58737feba8638e064bb5d4.tar.gz
qemu-3663dca461131f7c8e58737feba8638e064bb5d4.tar.bz2
curl: Store BDRVCURLState pointer in CURLSocket
A socket does not really belong to any specific state. We do not need to store a pointer to "its" state in it, a pointer to the common BDRVCURLState is sufficient. Signed-off-by: Max Reitz <mreitz@redhat.com> Message-Id: <20210309130541.37540-2-mreitz@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block')
-rw-r--r--block/curl.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/block/curl.c b/block/curl.c
index 4ff895d..43c79bc 100644
--- a/block/curl.c
+++ b/block/curl.c
@@ -78,7 +78,7 @@ typedef struct CURLAIOCB {
typedef struct CURLSocket {
int fd;
- struct CURLState *state;
+ struct BDRVCURLState *s;
QLIST_ENTRY(CURLSocket) next;
} CURLSocket;
@@ -155,7 +155,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;
+ socket->s = s;
QLIST_INSERT_HEAD(&state->sockets, socket, next);
}
@@ -385,7 +385,7 @@ static void curl_multi_check_completion(BDRVCURLState *s)
/* Called with s->mutex held. */
static void curl_multi_do_locked(CURLSocket *socket)
{
- BDRVCURLState *s = socket->state->s;
+ BDRVCURLState *s = socket->s;
int running;
int r;
@@ -401,7 +401,7 @@ static void curl_multi_do_locked(CURLSocket *socket)
static void curl_multi_do(void *arg)
{
CURLSocket *socket = arg;
- BDRVCURLState *s = socket->state->s;
+ BDRVCURLState *s = socket->s;
qemu_mutex_lock(&s->mutex);
curl_multi_do_locked(socket);