From nobody Mon Nov 17 17:47:49 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=1606982020; cv=none; d=zohomail.com; s=zohoarc; b=OR6Z4rjwI8xbLTL3ZtIjHKYnfp8QLSUCrgU3a9nK9pY0HVG6e77G2ybfrdmAGYkVB5MGEUtRKWOaqZwyQuSa/PcyLd5GWKwjOlF2fMEuXi/St/muGH99Yx8uy1j+DCScz6SDB4DS08NiDZIwVrLIs8tq+VT/508UWgTTabiItvo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606982020; 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=MKFbsiSf5YkYAQg8sch6t8JaDzSDAbolhYR67fLAL+c=; b=LDaGsCRAruww2QSDXD7cC35NTAt5+IvyGmkCkIZynT/3sgW5CBiCZRrw7W85Ksu4qxmbIXH1lDxa+mkwchKXC4ocsgweFQg2TP9LAdOa8iVpK/f9+opApZXXpZK1lrGNSAhCyXzXRIKAkPBy5U3uuZxLUl1NRPa/0JFjZnIZIIE= 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 1606982020955953.2775810034755; Wed, 2 Dec 2020 23:53:40 -0800 (PST) Received: from localhost ([::1]:48866 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kkjQp-0003NK-D3 for importer@patchew.org; Thu, 03 Dec 2020 02:53:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:32976) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kkjPh-0002HV-BI; Thu, 03 Dec 2020 02:52:29 -0500 Received: from szxga06-in.huawei.com ([45.249.212.32]:2109) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kkjPe-00047b-MH; Thu, 03 Dec 2020 02:52:28 -0500 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4Cmp2R1jmczhlmm; Thu, 3 Dec 2020 15:51:59 +0800 (CST) Received: from huawei.com (10.175.104.175) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.487.0; Thu, 3 Dec 2020 15:52:14 +0800 From: Gan Qixin To: , Subject: [PATCH v2 2/4] block/curl: Use lock guard macros Date: Thu, 3 Dec 2020 15:50:53 +0800 Message-ID: <20201203075055.127773-3-ganqixin@huawei.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201203075055.127773-1-ganqixin@huawei.com> References: <20201203075055.127773-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.32; envelope-from=ganqixin@huawei.com; helo=szxga06-in.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, 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, zhang.zhanghailiang@huawei.com, armbru@redhat.com, Gan Qixin , 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. Signed-off-by: Gan Qixin Reviewed-by: Paolo Bonzini --- Cc: Kevin Wolf Cc: Markus Armbruster --- 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.27.0