From nobody Sat Apr 12 04:11:44 2025 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1665147875; cv=none; d=zohomail.com; s=zohoarc; b=FkxXUUgRpuHZvhbGdOL6croZYZtDXUHJEfKC6NSM4zuWI7L2nUu8wPEXZJTi+OIsAJQbD6B8J4DF5lBiUirtpgnlqcBEkGdRnR97u/CabddEHt9P1YDYa44cAEFJCHuMCzjdC31i8x3o4x86SxUmvH2ZC4gS+YK0MyD1g+7MW+Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1665147875; h=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=+f8PptoQgZEerq3XQKIpTG03Vwo0qiZUEBDcjBNRHD8=; b=ZowJ7OEDyvROv7Gx3igsJFG9GEFMVFvbIwmY3yM5NeSdKcUk+Ds2D9UQO2DhmQbrlT0J/rCEouQF9PeLsUSXyV5tNjF7qHvc2D9UKW00iy5GYpGBW1xUfcawjcoaugwYpkqtM+K4VKwKWAgJnDYjEvnxgD8Ih92E3gDBnPryOVE= 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 lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1665147875194647.0388209482105; Fri, 7 Oct 2022 06:04:35 -0700 (PDT) Received: from localhost ([::1]:52084 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ogn1l-0005Zw-5C for importer@patchew.org; Fri, 07 Oct 2022 09:04:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38220) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ogkuN-0005wa-0J for qemu-devel@nongnu.org; Fri, 07 Oct 2022 06:48:47 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:57072) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ogkuL-0003Iu-B6 for qemu-devel@nongnu.org; Fri, 07 Oct 2022 06:48:46 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-663-JJzoI-jOP8iZOoLtOh8Lxg-1; Fri, 07 Oct 2022 06:48:43 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 35625185A78F; Fri, 7 Oct 2022 10:48:43 +0000 (UTC) Received: from merkur.fritz.box (unknown [10.39.192.109]) by smtp.corp.redhat.com (Postfix) with ESMTP id 74B932024CBB; Fri, 7 Oct 2022 10:48:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1665139724; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+f8PptoQgZEerq3XQKIpTG03Vwo0qiZUEBDcjBNRHD8=; b=ZImxU5Vtc3jvYsOnHHy812w5o91udHrFqAtrCHqj6XW3yYC29kFpkNZE99oMwsNgoymHL/ uaSjyTLGwfyuc6BeyJemXEi6237ref2TizEZDkPRvOKPfxe4GksMRX1uK0SZ+lBmKJ08BE NY/Emzjar+dTQt2mh9BR5XuOZkuvrp4= X-MC-Unique: JJzoI-jOP8iZOoLtOh8Lxg-1 From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, stefanha@redhat.com, qemu-devel@nongnu.org Subject: [PULL 43/50] blockjob: rename notifier callbacks as _locked Date: Fri, 7 Oct 2022 12:47:45 +0200 Message-Id: <20221007104752.141361-44-kwolf@redhat.com> In-Reply-To: <20221007104752.141361-1-kwolf@redhat.com> References: <20221007104752.141361-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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=170.10.129.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1665147876567100001 Content-Type: text/plain; charset="utf-8" From: Emanuele Giuseppe Esposito They all are called with job_lock held, in job_event_*_locked() Signed-off-by: Emanuele Giuseppe Esposito Reviewed-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Stefan Hajnoczi Reviewed-by: Kevin Wolf Message-Id: <20220926093214.506243-16-eesposit@redhat.com> Signed-off-by: Kevin Wolf --- blockjob.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/blockjob.c b/blockjob.c index c8919cef9b..d8fb5311c7 100644 --- a/blockjob.c +++ b/blockjob.c @@ -250,7 +250,8 @@ int block_job_add_bdrv(BlockJob *job, const char *name,= BlockDriverState *bs, return 0; } =20 -static void block_job_on_idle(Notifier *n, void *opaque) +/* Called with job_mutex lock held. */ +static void block_job_on_idle_locked(Notifier *n, void *opaque) { aio_wait_kick(); } @@ -370,7 +371,8 @@ static void block_job_iostatus_set_err(BlockJob *job, i= nt error) } } =20 -static void block_job_event_cancelled(Notifier *n, void *opaque) +/* Called with job_mutex lock held. */ +static void block_job_event_cancelled_locked(Notifier *n, void *opaque) { BlockJob *job =3D opaque; uint64_t progress_current, progress_total; @@ -389,7 +391,8 @@ static void block_job_event_cancelled(Notifier *n, void= *opaque) job->speed); } =20 -static void block_job_event_completed(Notifier *n, void *opaque) +/* Called with job_mutex lock held. */ +static void block_job_event_completed_locked(Notifier *n, void *opaque) { BlockJob *job =3D opaque; const char *msg =3D NULL; @@ -415,7 +418,8 @@ static void block_job_event_completed(Notifier *n, void= *opaque) msg); } =20 -static void block_job_event_pending(Notifier *n, void *opaque) +/* Called with job_mutex lock held. */ +static void block_job_event_pending_locked(Notifier *n, void *opaque) { BlockJob *job =3D opaque; =20 @@ -427,7 +431,8 @@ static void block_job_event_pending(Notifier *n, void *= opaque) job->job.id); } =20 -static void block_job_event_ready(Notifier *n, void *opaque) +/* Called with job_mutex lock held. */ +static void block_job_event_ready_locked(Notifier *n, void *opaque) { BlockJob *job =3D opaque; uint64_t progress_current, progress_total; @@ -472,11 +477,11 @@ void *block_job_create(const char *job_id, const Bloc= kJobDriver *driver, =20 ratelimit_init(&job->limit); =20 - job->finalize_cancelled_notifier.notify =3D block_job_event_cancelled; - job->finalize_completed_notifier.notify =3D block_job_event_completed; - job->pending_notifier.notify =3D block_job_event_pending; - job->ready_notifier.notify =3D block_job_event_ready; - job->idle_notifier.notify =3D block_job_on_idle; + job->finalize_cancelled_notifier.notify =3D block_job_event_cancelled_= locked; + job->finalize_completed_notifier.notify =3D block_job_event_completed_= locked; + job->pending_notifier.notify =3D block_job_event_pending_locked; + job->ready_notifier.notify =3D block_job_event_ready_locked; + job->idle_notifier.notify =3D block_job_on_idle_locked; =20 WITH_JOB_LOCK_GUARD() { notifier_list_add(&job->job.on_finalize_cancelled, --=20 2.37.3