From nobody Sun Feb 8 18:29:25 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1615839850; cv=none; d=zohomail.com; s=zohoarc; b=GENApFt2wb9WnSDrwq/YPMrpDnqceTZbkyhkmLsoR8B7rnq0s1WsB8R3/vlL1+4DF1WU9/VdLXRmPh+YRmZUPjXGYOdHVDGhM87vWVKyP+93DXNuu1PliGb0l73aMpJLRE5a9xBycsM5Z8mFpMYX0I523p5h2IlnJQZYLkGOZn0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615839850; 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=343Iudlhyqa3KTi01zwEIVOdtgmn+Ial5kl4C3BXF70=; b=fwm6y6DbL1XOKg8gVCe1/F0PWHRp2UJ6ZDCjo6k1VTnOSsnFZKXrSyLuaChmOH95LSeSjWsAobbiPMsGAJ8ZdliBWtIQ8JXSR3+MfhP5KtOfOJ4gXM7weIubxV2e65h/zxSy0MSAwYqNU4+lkrTUdYpIqM2+rEGhPIHMoNpv8zs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1615839850606813.7979078330546; Mon, 15 Mar 2021 13:24:10 -0700 (PDT) Received: from localhost ([::1]:39350 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lLtl3-0004vP-Kv for importer@patchew.org; Mon, 15 Mar 2021 16:24:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45524) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lLtaR-0000nh-48 for qemu-devel@nongnu.org; Mon, 15 Mar 2021 16:13:13 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:41512) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lLtaF-0006Ve-Ra for qemu-devel@nongnu.org; Mon, 15 Mar 2021 16:13:05 -0400 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-599-fau3gYVNP9KDIYl2GSnNnQ-1; Mon, 15 Mar 2021 16:12:55 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 98AB618460E2; Mon, 15 Mar 2021 20:12:53 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-114-235.ams2.redhat.com [10.36.114.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id EDDAB62680; Mon, 15 Mar 2021 20:12:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615839179; 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=343Iudlhyqa3KTi01zwEIVOdtgmn+Ial5kl4C3BXF70=; b=NMqFT+kVRz8N5Nzgjmwdi0TMIiSn4SVOVmR7CiWfdpEfEmIrpdkVp8QIc+Je29/nv2d6CM TMA9WM2vujPyz0UV8ZdWk47RgwU+AaQ6aI2Aiio6b34F4V5M4dUYVOYzmtIG5p+ZEfDbJp jrJymeI7hV+vtaz4TEzN1hOkBIUrmWA= X-MC-Unique: fau3gYVNP9KDIYl2GSnNnQ-1 From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, groug@kaod.org, vgoyal@redhat.com, wanghao232@huawei.com, ma.mandourr@gmail.com Subject: [PULL 9/9] migration: Replaced qemu_mutex_lock calls with QEMU_LOCK_GUARD Date: Mon, 15 Mar 2021 20:12:15 +0000 Message-Id: <20210315201215.222539-10-dgilbert@redhat.com> In-Reply-To: <20210315201215.222539-1-dgilbert@redhat.com> References: <20210315201215.222539-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dgilbert@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=216.205.24.124; envelope-from=dgilbert@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_H3=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: stefanha@redhat.com, peterx@redhat.com, quintela@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Mahmoud Mandour Replaced various qemu_mutex_lock calls and their respective qemu_mutex_unlock calls with QEMU_LOCK_GUARD macro. This simplifies the code by eliminating the respective qemu_mutex_unlock calls. Signed-off-by: Mahmoud Mandour Message-Id: <20210311031538.5325-7-ma.mandourr@gmail.com> Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Dr. David Alan Gilbert --- migration/migration.c | 6 ++---- migration/ram.c | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index a5ddf43559..36768391b6 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -323,7 +323,7 @@ static int migrate_send_rp_message(MigrationIncomingSta= te *mis, int ret =3D 0; =20 trace_migrate_send_rp_message((int)message_type, len); - qemu_mutex_lock(&mis->rp_mutex); + QEMU_LOCK_GUARD(&mis->rp_mutex); =20 /* * It's possible that the file handle got lost due to network @@ -331,7 +331,7 @@ static int migrate_send_rp_message(MigrationIncomingSta= te *mis, */ if (!mis->to_src_file) { ret =3D -EIO; - goto error; + return ret; } =20 qemu_put_be16(mis->to_src_file, (unsigned int)message_type); @@ -342,8 +342,6 @@ static int migrate_send_rp_message(MigrationIncomingSta= te *mis, /* It's possible that qemu file got error during sending */ ret =3D qemu_file_get_error(mis->to_src_file); =20 -error: - qemu_mutex_unlock(&mis->rp_mutex); return ret; } =20 diff --git a/migration/ram.c b/migration/ram.c index 72143da0ac..52537f14ac 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -819,7 +819,7 @@ static inline bool migration_bitmap_clear_dirty(RAMStat= e *rs, { bool ret; =20 - qemu_mutex_lock(&rs->bitmap_mutex); + QEMU_LOCK_GUARD(&rs->bitmap_mutex); =20 /* * Clear dirty bitmap if needed. This _must_ be called before we @@ -852,7 +852,6 @@ static inline bool migration_bitmap_clear_dirty(RAMStat= e *rs, if (ret) { rs->migration_dirty_pages--; } - qemu_mutex_unlock(&rs->bitmap_mutex); =20 return ret; } @@ -3275,7 +3274,7 @@ static void decompress_data_with_multi_threads(QEMUFi= le *f, int idx, thread_count; =20 thread_count =3D migrate_decompress_threads(); - qemu_mutex_lock(&decomp_done_lock); + QEMU_LOCK_GUARD(&decomp_done_lock); while (true) { for (idx =3D 0; idx < thread_count; idx++) { if (decomp_param[idx].done) { @@ -3295,7 +3294,6 @@ static void decompress_data_with_multi_threads(QEMUFi= le *f, qemu_cond_wait(&decomp_done_cond, &decomp_done_lock); } } - qemu_mutex_unlock(&decomp_done_lock); } =20 /* --=20 2.30.2