From nobody Sat May 30 17:43:43 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1779454681; cv=none; d=zohomail.com; s=zohoarc; b=YuLOotsb6SQPdYfe0k2TldjT+XiC+AEZ/KkXiqRrbjOVAQTp9FEaOoqPjSEn79cE+UFNER63IPDTPVe2vN0ZWeWPNpWGcR/4LRPVBGpJMUW2wuyH5SdzigWk3y+Sc1b3QFSuhqJr6ksuWSU6l7Llh0tjjd+QWUturr95UjLEsbA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779454681; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=vTXnbyvk/cqKWEhYjnlE7291MHIAgtVT3fS3zVYhA24=; b=BN4SoVY81U33TJWasE6AyTwLf2uIfJ9d3GvXPBj0Dol/qxfRuIp0sTURBJgv2CRaHeL60yrTPHHsPpntS48nVIC5BmS1KcZ1NdNmQk2rrfUzp3GzIBHab7j7tgM4Bu5cm/MMMb8PmbZ0V8WDPrAb2SObMD/e/a938d/P2RGuUm8= 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) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779454681454791.7044843222376; Fri, 22 May 2026 05:58:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wQPR5-0004iY-Vs; Fri, 22 May 2026 08:57:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wQKv6-0005OZ-QZ for qemu-devel@nongnu.org; Fri, 22 May 2026 04:07:49 -0400 Received: from mail-lf1-x12f.google.com ([2a00:1450:4864:20::12f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wQKv3-0002jp-Vn for qemu-devel@nongnu.org; Fri, 22 May 2026 04:07:48 -0400 Received: by mail-lf1-x12f.google.com with SMTP id 2adb3069b0e04-5a8ee4b703fso6583381e87.0 for ; Fri, 22 May 2026 01:07:44 -0700 (PDT) Received: from machine.. ([37.113.215.232]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5aa32cf95c9sm239722e87.78.2026.05.22.01.07.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 May 2026 01:07:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779437263; x=1780042063; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vTXnbyvk/cqKWEhYjnlE7291MHIAgtVT3fS3zVYhA24=; b=fLdZA7Y5bPLYPIYqbPlEYr8ZRYjiSnEGBF52wCxfPaL1HBFW8ZOquzXAihnkjEQunv MFw3AY+N3+wkwFGyMiDM/lH1v9CQ9QrYIyrxBBgITK/aD/NBTaE3XaCicnC9Tb8qS5J8 4fDflwA/y14o5X4KuycD1vhPVFzJg9msQAYoRypbhRLnLrI5RnWU/qwL8tztaojIdCkg DUhZl02D4Z0kyViJLCXN5VmrdbL1vH2di4hRzHA904iN5unEuxzw8z6hn0IqRNlAmpgt naqwDm10MprEXoAZoEhpE553PKQCRIJsntnOTNzg2OrkqVNaTcGYOkrKfmZiEb2sg/BD GUcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779437263; x=1780042063; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=vTXnbyvk/cqKWEhYjnlE7291MHIAgtVT3fS3zVYhA24=; b=I19tVA+AK3P/Sd4aNr9U15XFLMRNOoCVSY2NDCkI8cHfoZOWnhmQ2gkxAPNxpRdUwt swRi2uJ71JyWeu383HKaNWzrfj6k9YMPw+Rq/vrRQf+RaWlLc1+TV/vxDRFWnu+bMExy rRZYzAurcx0FU5pt5uDc7qVFQ2PNfKAUSr4hpeqrHQctawiS1p65lK06TywaH+6TYOb1 0MQ6zqyXMXIbvGIwF8bV38WfCJRXEc4aT6J9wP+TLX1wjdm7FZ2+n4GjaiK8fmias07F dPvKrV3Cjpapvk4KXvCLJdNp+QZWdyS+CW3MyDlt/pvrNTVO8HRgFPn2YubexrPIebAb qKSw== X-Gm-Message-State: AOJu0YxqC9ScXxnAi6agE8z4HpXNfUARPChbwMppPjK+IBrbPJfCum9b rrIU2xa/ONu8lvdaSsbPIEvBdsNFicu0crrsYj2Ilpd0fCj/xJySvSXECvD6HAiAANw= X-Gm-Gg: Acq92OG2uGs8mavTzCcBbj2CIiLEu9mPygipBog1rE8E5fugde5/RuK7L7+5UGrqqAN EsFecmfEY3b6muwadZJezERK2wWPUmcfeTJmNFNhNcKh2KpKlvreX1BiR3BlvTeiZBMeH47dS25 Coz619Te8i0IFJ7Tx80LFDbT/LwU5ndAGXOOP3VtEeZu6uJKQ8FX//hXwrwFq33+cAyvewryDHw hg+BBx+1djwFyKKs12NiXqXQM3aT5JyzO6LJ8GChV5vGIq2X/EA2cgdb2117aSVRzY66sMT9yHQ Rl6f03mmkxbKSjNlUpzH+pPNr29NaQKB/D+kaqGV+GtbhvBGUrBrIROC+CtfeqncVPMs9y3jf6K 7tKxLHe0MML277dToDUGHzVQgNiUafkuId7WraBYaM9ZIjn8Izn3RQfftaxf9qd4X0TxgmT73Ok ruOpqCkTmGEbK7 X-Received: by 2002:a05:6512:3ca7:b0:5a8:f03c:fb1e with SMTP id 2adb3069b0e04-5aa323b52damr733766e87.18.1779437263227; Fri, 22 May 2026 01:07:43 -0700 (PDT) From: Evgeny Kolmakov To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, stefanha@redhat.com, fam@euphon.net, kwolf@redhat.com, hreitz@redhat.com, zhangckid@gmail.com, lizhijian@fujitsu.com, jasowang@redhat.com, Evgeny Kolmakov Subject: [PATCH 1/2] net/colo-compare: Use QEMU_LOCK_GUARD to simplify mutex handling Date: Fri, 22 May 2026 11:06:43 +0300 Message-ID: <20260522080644.9531-2-randomjack94dev@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260522080644.9531-1-randomjack94dev@gmail.com> References: <20260522080644.9531-1-randomjack94dev@gmail.com> MIME-Version: 1.0 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::12f; envelope-from=randomjack94dev@gmail.com; helo=mail-lf1-x12f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Fri, 22 May 2026 08:57:05 -0400 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1779454684311154100 Content-Type: text/plain; charset="utf-8" Replace qemu_mutex_(un)lock() calls with the QEMU_LOCK_GUARD(). Signed-off-by: Evgeny Kolmakov Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Zhang Chen --- net/colo-compare.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/net/colo-compare.c b/net/colo-compare.c index 823b8aa323..5986fb1e88 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -902,14 +902,13 @@ static void check_old_packet_regular(void *opaque) void colo_notify_compares_event(void *opaque, int event, Error **errp) { CompareState *s; - qemu_mutex_lock(&colo_compare_mutex); + QEMU_LOCK_GUARD(&colo_compare_mutex); =20 if (!colo_compare_active) { - qemu_mutex_unlock(&colo_compare_mutex); return; } =20 - qemu_mutex_lock(&event_mtx); + QEMU_LOCK_GUARD(&event_mtx); QTAILQ_FOREACH(s, &net_compares, next) { s->event =3D event; qemu_bh_schedule(s->event_bh); @@ -919,9 +918,6 @@ void colo_notify_compares_event(void *opaque, int event= , Error **errp) while (event_unhandled_count > 0) { qemu_cond_wait(&event_complete_cond, &event_mtx); } - - qemu_mutex_unlock(&event_mtx); - qemu_mutex_unlock(&colo_compare_mutex); } =20 static void colo_compare_timer_init(CompareState *s) --=20 2.43.0 From nobody Sat May 30 17:43:43 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1779454667; cv=none; d=zohomail.com; s=zohoarc; b=mstZf4ujQwCfnmJUrPWIkh3HwgzPnGNjmj2+5MY/FYotMh01KCcC0jBZ+VNxwEYN2ouHYj6sGXPj1zh7ysavtDWWsy1dGU7WN741C7LORn601glY9JIT3pjO/CfcVeEslDyKcqW9VA3KmA/Y4hecjlJTMQzuzJpMQYiEq+PcIgQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779454667; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=loYQlF2qxM1tBZE5Eo5pBRl1/ffs/7Vck73oZUWkv6w=; b=WFJlchoxTIvmXv31VllgZkCaozsl0yMe0n7HFNXoxJUsI+sxsniU3qPZPx0/gzOYKyx390jc+KzMV1uJNNxobj9MX9r2mJLzmp1tSbnspzIzx0PFdoczAB7Z3elNV4DtnF0KcMiSLMb1nguDU+Q8XFAmroe4J6aiukJ2deEhobc= 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) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779454667017561.5273558964114; Fri, 22 May 2026 05:57:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wQPR6-0004ia-Ty; Fri, 22 May 2026 08:57:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wQKv7-0005PE-Ts for qemu-devel@nongnu.org; Fri, 22 May 2026 04:07:49 -0400 Received: from mail-lf1-x132.google.com ([2a00:1450:4864:20::132]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wQKv6-0002kn-I9 for qemu-devel@nongnu.org; Fri, 22 May 2026 04:07:49 -0400 Received: by mail-lf1-x132.google.com with SMTP id 2adb3069b0e04-5a62f43b76aso7875638e87.3 for ; Fri, 22 May 2026 01:07:47 -0700 (PDT) Received: from machine.. ([37.113.215.232]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5aa32cf95c9sm239722e87.78.2026.05.22.01.07.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 May 2026 01:07:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779437266; x=1780042066; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=loYQlF2qxM1tBZE5Eo5pBRl1/ffs/7Vck73oZUWkv6w=; b=T076DmjaPHzXosx2zT9hjx1H4T6ooplovn/HFYFmEzVShOKPl8Jz5Bd8/LVuge9RTk BW+wnDvn/pcC3H7SklVEsgi1C+AXodSbDzanResuOUfZKmBbDgSNHR9z/z4OrjADH+Me FTCLPR1/uR6ReGsfMBO0CICYel99nfrjx1GXFF+AsBq4B8HGT6dzjyd3PhdCECTue27E 4NNelh7+O51ugI9unuiQ51JibZSEDxLlwDBoWBwiwClIUx7L1JIVlCv9kvvNNFJ/n2l/ NSV7KfrInNKQwR5LEhDtmezGl9PB/8oK4e9LshzZWxsS0Pp3pSFNKreOJO0fSzT8mG7i I0VA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779437266; x=1780042066; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=loYQlF2qxM1tBZE5Eo5pBRl1/ffs/7Vck73oZUWkv6w=; b=sinmV1OWfasBkhIpT6KpZbpBVdphx5Y+omg1RNU3K0IYkyOQmOEyk2EfQBc051vBdO HBnJBYN55WKFUVPn8XRG5BTrZnRhkk5LHg2b+XYt0A9CZFBuvuYdr0yI5xxK889kBCbb pmxmB0jlwBj6kJJzwJXUFQ+yjjImA5dh4OZhVDbFJBQIv4f8jOFRKVNwcu0+37pGRDgX /uCNTbGuQCKuNeR5YeAPb0dAQVKNas6BcWitjwOBpCnYRfb2khbyLkRaHdicvBKyd1KE uI7dc0G1e17Xi17vvQm6Dycmk9CxKzlh/Qk62FTg4PTrYw7r+NGY/mqIBP5gXXiQQMIV v4qg== X-Gm-Message-State: AOJu0Yx/7RHjqrGAP9uDzCYHSupw/6RT+S+jvf6IgFJvCJOgsvgxJ1To CA+E6/YWPamVl2EMDtL7TvPM8MyRK4EsxrOndaDbHu/lumcCj39jHoStNJrjfeJLr7s= X-Gm-Gg: Acq92OHciap2+N0r8FKirrZm96sulg5HVcQpEmOGwBnpHnGXKduimCs194UeLwLOhiO FHNIqjZksafnAoQm+Zpk92lhJOGi0CabFePRdy4mpKy7M9oJr3qwVT8XSrRHQeLj5Aeasha6bJn Kt4obYQguR+LJCCjYlaojsig7ontphUh3Uko80Fejo2aBuQm4W5Aq/aup86RGwrIHv1l52QBcn9 fta+fcO4R50K9vMBKkyVny4RqmONnH+J1H2d3rGz5Ommcq8M91iIaxAlD1I5pzSDL+Oe6NBy/cf Ty1hwO8YHh3STBpgJdZgg/ujQk/NJwdNKW7t8UZbOmQi/qVVfpt/ry573FOTgXROsQd9pMPYoBs 7sPIfQ5mD3vWkCtk+keoo4mfnjf9cgLD4fjk4JcUn0I/ErpG65gjNe/aePoonELsRIb1cBkpDwi d7iW9ED1r4SQZGkddtSN8ynOo= X-Received: by 2002:ac2:5586:0:b0:5a2:c6f2:fd5a with SMTP id 2adb3069b0e04-5aa3239b99fmr558679e87.21.1779437266002; Fri, 22 May 2026 01:07:46 -0700 (PDT) From: Evgeny Kolmakov To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, stefanha@redhat.com, fam@euphon.net, kwolf@redhat.com, hreitz@redhat.com, zhangckid@gmail.com, lizhijian@fujitsu.com, jasowang@redhat.com, Evgeny Kolmakov Subject: [PATCH 2/2] block/io: Use QEMU_LOCK_GUARD to simplify mutex handling Date: Fri, 22 May 2026 11:06:44 +0300 Message-ID: <20260522080644.9531-3-randomjack94dev@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260522080644.9531-1-randomjack94dev@gmail.com> References: <20260522080644.9531-1-randomjack94dev@gmail.com> MIME-Version: 1.0 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::132; envelope-from=randomjack94dev@gmail.com; helo=mail-lf1-x132.google.com X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FORGED_GMAIL_RCVD=1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Fri, 22 May 2026 08:57:05 -0400 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1779454670263154100 Content-Type: text/plain; charset="utf-8" Replace qemu_mutex_(un)lock() calls with QEMU_LOCK_GUARD(). Signed-off-by: Evgeny Kolmakov Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Zhang Chen --- block/io.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/block/io.c b/block/io.c index e8fb4ede4d..1020047888 100644 --- a/block/io.c +++ b/block/io.c @@ -719,14 +719,12 @@ BdrvTrackedRequest *coroutine_fn bdrv_co_get_self_req= uest(BlockDriverState *bs) Coroutine *self =3D qemu_coroutine_self(); IO_CODE(); =20 - qemu_mutex_lock(&bs->reqs_lock); + QEMU_LOCK_GUARD(&bs->reqs_lock); QLIST_FOREACH(req, &bs->tracked_requests, list) { if (req->co =3D=3D self) { - qemu_mutex_unlock(&bs->reqs_lock); return req; } } - qemu_mutex_unlock(&bs->reqs_lock); =20 return NULL; } --=20 2.43.0