From nobody Mon Nov 17 17:49:12 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 ARC-Seal: i=1; a=rsa-sha256; t=1604989200; cv=none; d=zohomail.com; s=zohoarc; b=XZdljexGu6MO3hEahAPS3+DxJ1B599mDKaWuajEov6IES4kJj18S1LSXZdIVrw+FYkhUsiHqW0DdQQ9vQpZXTwoGPeUlrtccyszCXmq/Oy7WwYNAIst1jemUsVoj89Zvslsckw55VxifCBh0aa+s7UZ8u4lIGEQ22DSQ4fLLdys= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604989200; 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=EtXPVI+i7dLOha5//k2tLZuLsFeZlRAatKqBaoVLjVQ=; b=hBYTgQbXj6azU8R24Ot1eHwFOUfYdBoQuFowPz9/lBVP2lZ83kh50jbXm0hoh4zNtDZN+aHbTju/9dTXoe3T7tuFxHN7wu4ucQ9+gHr6mcnVDGRwC7wWbuelsWvcyRFMfd5injCU1F7VYc6GSkWcLiYZCSGX0/MMIDQQst7ah7Y= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1604989200804391.7232293587224; Mon, 9 Nov 2020 22:20:00 -0800 (PST) Received: from localhost ([::1]:46328 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcN0Z-0000wq-Qq for importer@patchew.org; Tue, 10 Nov 2020 01:19:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42444) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcMxt-0005dj-21; Tue, 10 Nov 2020 01:17:13 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:2513) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcMxp-0003ZJ-6U; Tue, 10 Nov 2020 01:17:12 -0500 Received: from DGGEMS410-HUB.china.huawei.com (unknown [172.30.72.58]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4CVd1L0yKtzhjjM; Tue, 10 Nov 2020 14:16:54 +0800 (CST) Received: from huawei.com (10.175.104.175) by DGGEMS410-HUB.china.huawei.com (10.3.19.210) with Microsoft SMTP Server id 14.3.487.0; Tue, 10 Nov 2020 14:16:50 +0800 From: Gan Qixin To: , Subject: [PATCH 2/4] block/curl.c: Use lock guard macros Date: Mon, 9 Nov 2020 23:43:25 +0800 Message-ID: <20201109154327.325675-3-ganqixin@huawei.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20201109154327.325675-1-ganqixin@huawei.com> References: <20201109154327.325675-1-ganqixin@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.104.175] X-CFilter-Loop: Reflected 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=45.249.212.191; envelope-from=ganqixin@huawei.com; helo=szxga05-in.huawei.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/10 01:17:02 X-ACL-Warn: Detected OS = Linux 3.1-3.10 [fuzzy] X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DATE_IN_PAST_12_24=1.049, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-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, Gan Qixin , zhang.zhanghailiang@huawei.com, mreitz@redhat.com, dnbrdsky@gmail.com, stefanha@redhat.com, kuhn.chenqun@huawei.com, pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Replace manual lock()/unlock() calls with lock guard macros (QEMU_LOCK_GUARD/WITH_QEMU_LOCK_GUARD) in block/curl.c. Signed-off-by: Gan Qixin --- block/curl.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/block/curl.c b/block/curl.c index 4f907c47be..d24a4c5897 100644 --- a/block/curl.c +++ b/block/curl.c @@ -564,23 +564,23 @@ static void curl_detach_aio_context(BlockDriverState = *bs) BDRVCURLState *s =3D bs->opaque; int i; =20 - qemu_mutex_lock(&s->mutex); - for (i =3D 0; i < CURL_NUM_STATES; i++) { - if (s->states[i].in_use) { - curl_clean_state(&s->states[i]); + WITH_QEMU_LOCK_GUARD(&s->mutex) { + for (i =3D 0; i < CURL_NUM_STATES; i++) { + if (s->states[i].in_use) { + curl_clean_state(&s->states[i]); + } + if (s->states[i].curl) { + curl_easy_cleanup(s->states[i].curl); + s->states[i].curl =3D NULL; + } + g_free(s->states[i].orig_buf); + s->states[i].orig_buf =3D NULL; } - if (s->states[i].curl) { - curl_easy_cleanup(s->states[i].curl); - s->states[i].curl =3D NULL; + if (s->multi) { + curl_multi_cleanup(s->multi); + s->multi =3D NULL; } - g_free(s->states[i].orig_buf); - s->states[i].orig_buf =3D NULL; - } - if (s->multi) { - curl_multi_cleanup(s->multi); - s->multi =3D NULL; } - qemu_mutex_unlock(&s->mutex); =20 timer_del(&s->timer); } --=20 2.23.0