From nobody Mon Feb 9 00:01:33 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1615476591; cv=none; d=zohomail.com; s=zohoarc; b=Zkg4pioU4ulpuuRxobCPjsZ1fDkZQUQWM7a/KM7uKj5AqfV/WjxOq9pZkvfwnoq/vxfxhjRkTJMiwuoBC9NZn9ehEmsKKoRN2fUdGRIF1jOZ71UjvXO6+xLNUWTa+X67eu21Tza1/xRtJ4XJpCtMYQs4GK8DlaiBoA4+dHBf4OQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615476591; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=etyTY3fKwJy3x6FugYs1IuvelQvUX2nVDOJIoEFKQd0=; b=Da6mTahBBVx7RCyalU1ExB3iXRO4hm3v1kihPRYj8XytI0xsm6M0oy2wX7x/nM4ZqxH2kHzn+i0PBRHc0oTTDRQckLZdMmlrRrvWVvVCaBZoG3UexLiDkSBlBAcw5rTsg2ZgXJucgvmPJePaDHeMejtDK+K647UPVc3d+gqFu/U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615476591945998.2882194824602; Thu, 11 Mar 2021 07:29:51 -0800 (PST) Received: from localhost ([::1]:36550 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lKNG2-0007rw-SH for importer@patchew.org; Thu, 11 Mar 2021 10:29:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42124) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKMc5-0004pN-1q for qemu-devel@nongnu.org; Thu, 11 Mar 2021 09:48:33 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:31309) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lKMc2-0002nE-3I for qemu-devel@nongnu.org; Thu, 11 Mar 2021 09:48:32 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-322-nhFAr8JxMv2HcfmNC2EL2A-1; Thu, 11 Mar 2021 09:48:25 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 607738030DD; Thu, 11 Mar 2021 14:48:24 +0000 (UTC) Received: from merkur.fritz.box (ovpn-114-112.ams2.redhat.com [10.36.114.112]) by smtp.corp.redhat.com (Postfix) with ESMTP id 59EA75DDAD; Thu, 11 Mar 2021 14:48:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615474109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=etyTY3fKwJy3x6FugYs1IuvelQvUX2nVDOJIoEFKQd0=; b=hFmW/x8VMdBeyl45WfpCs8goy+NP+yYxFHI09rcDV5NyX8ck+b8qz5eViO2gljYGjC39kI dqb0ZauqPBcGTfsrNcK/WSzIRBlMeaVudnoGVqnL89MFTQ+HF9JuOhq+skgHqzFmmujx2k Dv1cmkja0KnJKajGS1lnJHY2rS+xjwc= X-MC-Unique: nhFAr8JxMv2HcfmNC2EL2A-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PULL 04/38] curl: Store BDRVCURLState pointer in CURLSocket Date: Thu, 11 Mar 2021 15:47:37 +0100 Message-Id: <20210311144811.313451-5-kwolf@redhat.com> In-Reply-To: <20210311144811.313451-1-kwolf@redhat.com> References: <20210311144811.313451-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kwolf@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Max Reitz 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 Message-Id: <20210309130541.37540-2-mreitz@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Kevin Wolf --- block/curl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/block/curl.c b/block/curl.c index 4ff895df8f..43c79bcf36 100644 --- a/block/curl.c +++ b/block/curl.c @@ -78,7 +78,7 @@ typedef struct CURLAIOCB { =20 typedef struct CURLSocket { int fd; - struct CURLState *state; + struct BDRVCURLState *s; QLIST_ENTRY(CURLSocket) next; } CURLSocket; =20 @@ -155,7 +155,7 @@ static int curl_sock_cb(CURL *curl, curl_socket_t fd, i= nt action, if (!socket) { socket =3D g_new0(CURLSocket, 1); socket->fd =3D fd; - socket->state =3D state; + socket->s =3D s; QLIST_INSERT_HEAD(&state->sockets, socket, next); } =20 @@ -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 =3D socket->state->s; + BDRVCURLState *s =3D socket->s; int running; int r; =20 @@ -401,7 +401,7 @@ static void curl_multi_do_locked(CURLSocket *socket) static void curl_multi_do(void *arg) { CURLSocket *socket =3D arg; - BDRVCURLState *s =3D socket->state->s; + BDRVCURLState *s =3D socket->s; =20 qemu_mutex_lock(&s->mutex); curl_multi_do_locked(socket); --=20 2.29.2