From nobody Sun Jul 12 00:33:18 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=1783628954; cv=none; d=zohomail.com; s=zohoarc; b=UaSc/+kw5YeMB+WKKUswIVVv8mSAgOn7g1Sra131QKJ9WB2NFF3rn3rbU+mMPSy0ly6P4Va+N3oMjlHeyuhJ8ZweKsUMIGnY/9kbnL3MjUqOqn5pTOJk6SfrIQa/eaEKZ4B4qun1mUX1OmwuLInRHQitdMlAuLvLofh74YpJQa8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1783628954; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=lK1zpbyr0sEe7U9mK48Dpu/WkfnxcH8pX3QyNSJ86tA=; b=MUuW+qgYnbuJ0SKlzLHAYjV7/d7qsosBEo0wjqJZOl2tuM2yO18H5JEb0vnlwrmTEn6x2Ec8wXxxtz6uLBWo4G24I9WN4kCGTxBs9FngOc2UKHC+b25EY5KY6+6N+yisBHNMvyVin0/LahMDvaQU/URZoT75/ObjE9/8MzCdCm0= 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 178362895430680.70529853201504; Thu, 9 Jul 2026 13:29:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1whvM9-0003Ca-MJ; Thu, 09 Jul 2026 16:28:25 -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 1whvM8-0003CH-3g for qemu-devel@nongnu.org; Thu, 09 Jul 2026 16:28:24 -0400 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1whvM6-0000dS-OE for qemu-devel@nongnu.org; Thu, 09 Jul 2026 16:28:23 -0400 Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-c15e2937e9dso41343166b.0 for ; Thu, 09 Jul 2026 13:28:22 -0700 (PDT) Received: from machine.. ([37.113.214.163]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c15c38c164asm375453166b.3.2026.07.09.13.28.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jul 2026 13:28:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783628901; x=1784233701; darn=nongnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=lK1zpbyr0sEe7U9mK48Dpu/WkfnxcH8pX3QyNSJ86tA=; b=WhTevbJ3SPmDTY9HpaV2YAv93baIkaAHSg+JYnlVWr8ag9BaV8IFNiewSeiSrXHFOL Op49tzP89gfQ/NuVzoETVgvuzKq1VS8QfT8+UZH+5YShiCmTNa6S9en4k205yuiiYr+M NjVSFaWwLkHmRaIj8Pm7O3eXpc4w3Z0j/vgm5iQEnrtfWVTtR1uj6khwy8WQGsgbzocl nTA5a7+3AgZXEKHP+T2UgyqoxFsdVmBiwCSAB620wbAcI5B5XytG8PeZyT6xdxjKMO9m YY8ZK3dGdaCV/0ksqRZxkKniY55ab0VpzNprVjLeO7jobsunDQ6UI04l/bI8GlvpiM4O lIKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783628901; x=1784233701; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=lK1zpbyr0sEe7U9mK48Dpu/WkfnxcH8pX3QyNSJ86tA=; b=qV4me498XfanB4J0jp+U/P8UVHSnYuYLofHzSLEFto/sGl4w8P8vSNWI/y8JBX7pci KCo5FNg2RGRQZuPatMlDFYo0nAufSK9p7GDMNtzSucDKmcr144qbVvejW8kMkLi+DZXN HVkhKSmEywblaj4M4riw6s9EbqLQjB2v76OhfMTledWzvFPhqpIuuITxGwTRLc6XNfIt eigkNy/xcvm2zPpkbtPA0EV1L4zb5fLQ3LTudGbnbRN8OOBf5St5DyXQXh+aC8qvVPQJ Z0uqA3lcYZNr+7lkDKds4/wmLVDAehCzYd01Iz6NCIKZsb1hMlt54FdW9uKktoYRtGOR GJ+w== X-Gm-Message-State: AOJu0Yx1sYYO7sbAVLBZJ+yrtC1qkE7CR0J+0M/sNdO1TN9f/bLqDMTl tFnGdm8G/gvAyqaypGqQWtC2JqpYNPuS1zAXjGkTda+BHWUvRfKrrD3Mse4gmQ== X-Gm-Gg: AfdE7cmCNjdW0WJHAGnap9fTZj0GAgvgMcJoLClrCkYXQon3VBryCUoiMU3Da7VFgOU DgFr0m/Ycu+bCRTmYxNOA8WOyilOGkxljYcoTLPTpoiYBXqDeFzxKRb1sojhR4cMROPK9e9605B b687yLkFzvbrkDr6K4+PluyF7BYWQjVnZe+/fn5F9RLn93JiDbZegl5+fL0vXCETVzeqRM26VaO nUn93/NSsJOM4pLtxzpCSwfOJRZvSjUZiAVI0zNK1mw4nu+JkUcUDHTAM7qGoLK+XOfLlujz7Fc y0BMmxJQbtl1VpCaWNhbzIe9+gd1gm+9nj908tzhO4/7LYX4ApTwkX/p8e4NFPkeau+Hn1XsK9N miRkctjLK1865swFr5xGS+9q8GoioLE6S2u2joLo/kBWyKNDk7s66iqD6IfwtH+M1KEW143av1W MpftLjPgywXkiruBmWUbiKhaAhOYU= X-Received: by 2002:a17:907:3c84:b0:c12:54c8:16f0 with SMTP id a640c23a62f3a-c15ce237960mr378418166b.63.1783628900611; Thu, 09 Jul 2026 13:28:20 -0700 (PDT) From: Evgeny Kolmakov To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, maciej.szmigiero@oracle.com, Evgeny Kolmakov Subject: [PATCH] hw/hyperv/vmbus: Use QEMU_LOCK_GUARD() Date: Thu, 9 Jul 2026 23:27:22 +0300 Message-ID: <20260709202722.7291-1-randomjack94dev@gmail.com> X-Mailer: git-send-email 2.43.0 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::629; envelope-from=randomjack94dev@gmail.com; helo=mail-ej1-x629.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: 1783628956718158500 Content-Type: text/plain; charset="utf-8" Replace manual qemu_mutex_(un)lock() calls with QEMU_LOCK_GUARD() to remove 'goto out' code Signed-off-by: Evgeny Kolmakov --- hw/hyperv/vmbus.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/hw/hyperv/vmbus.c b/hw/hyperv/vmbus.c index c5259d1a76..ab99f082d1 100644 --- a/hw/hyperv/vmbus.c +++ b/hw/hyperv/vmbus.c @@ -1525,14 +1525,12 @@ static VMBusChannel *find_channel(VMBus *vmbus, uin= t32_t id) static int enqueue_incoming_message(VMBus *vmbus, const struct hyperv_post_message_input= *msg) { - int ret =3D 0; uint8_t idx, prev_size; =20 - qemu_mutex_lock(&vmbus->rx_queue_lock); + QEMU_LOCK_GUARD(&vmbus->rx_queue_lock); =20 if (vmbus->rx_queue_size =3D=3D HV_MSG_QUEUE_LEN) { - ret =3D -ENOBUFS; - goto out; + return -ENOBUFS; } =20 prev_size =3D vmbus->rx_queue_size; @@ -1544,9 +1542,7 @@ static int enqueue_incoming_message(VMBus *vmbus, if (!prev_size) { vmbus_resched(vmbus); } -out: - qemu_mutex_unlock(&vmbus->rx_queue_lock); - return ret; + return 0; } =20 static uint16_t vmbus_recv_message(const struct hyperv_post_message_input = *msg, @@ -2097,10 +2093,10 @@ static void process_message(VMBus *vmbus) void *msgdata; uint32_t msglen; =20 - qemu_mutex_lock(&vmbus->rx_queue_lock); + QEMU_LOCK_GUARD(&vmbus->rx_queue_lock); =20 if (!vmbus->rx_queue_size) { - goto unlock; + return; } =20 hv_msg =3D &vmbus->rx_queue[vmbus->rx_queue_head]; @@ -2149,8 +2145,6 @@ out: vmbus->rx_queue_head %=3D HV_MSG_QUEUE_LEN; =20 vmbus_resched(vmbus); -unlock: - qemu_mutex_unlock(&vmbus->rx_queue_lock); } =20 static const struct { --=20 2.43.0