From nobody Mon Feb 9 11:51:26 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1656513541; cv=none; d=zohomail.com; s=zohoarc; b=XpRfRgh3ZtBqgiQ9MwsRx87J4lpwssxeMWFKuvgco2Fs+gtcSQToLNa6rNb9AUv35xcGelrVuGlwZZ/ENJPoR7qohw7bKpXyfswvo4BJRCbziBDb/GuYwNGjEMeiF16rU+5mifFH+P7F1zG+lVqzWtqCuGH7Et7YRX2LXrux7qc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1656513541; 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=fZLIi4ztmhGQMSsiZRqJz/mEYK9KxeBAMKyqhVKObsw=; b=d7vE3cyaAe69Z8dIq3YAIGW4LnT1vOTqF20q5lHo/MMkGosq1nEMYF7r4YfFayzTN4dDfaeiBVgObRE+Vg5j1nRCu1KsY9mJBvs40MFlch4uwgW+arppJr67Vuys59dQbKTm7PKwyOAkUIvNdzWWCnlSGWGGDvy/ug9oBh3sVLs= 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 1656513541861351.59272138939343; Wed, 29 Jun 2022 07:39:01 -0700 (PDT) Received: from localhost ([::1]:37208 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o6YqJ-0004iA-PL for importer@patchew.org; Wed, 29 Jun 2022 10:39:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36566) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6YU4-0007xT-0v for qemu-devel@nongnu.org; Wed, 29 Jun 2022 10:16:03 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:32989) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o6YTv-000249-KQ for qemu-devel@nongnu.org; Wed, 29 Jun 2022 10:15:59 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-249-AoxynU6EPsS_VUZVdCVdzg-1; Wed, 29 Jun 2022 10:15:46 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 46E21384F806; Wed, 29 Jun 2022 14:15:46 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id EB60C9D63; Wed, 29 Jun 2022 14:15:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656512150; 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=fZLIi4ztmhGQMSsiZRqJz/mEYK9KxeBAMKyqhVKObsw=; b=a/NyyWckQtfHB1kpYk1IOyaWK+4199g1IniOtNsW0v3fivDvMtQcC0RkwYaMSqlNNBU7MY oUCCuw/6U5n0U/4JycQVD8Koc3Vhm/6SiQUkSMRUsBZYZm+mUJO5w84nHuOY3Rwwxsr/AD FJUTcRrDcnZocvZh8NkiuWMVja6AH7A= X-MC-Unique: AoxynU6EPsS_VUZVdCVdzg-1 From: Emanuele Giuseppe Esposito To: qemu-block@nongnu.org Cc: Kevin Wolf , Hanna Reitz , Paolo Bonzini , John Snow , Vladimir Sementsov-Ogievskiy , Wen Congyang , Xie Changlong , Markus Armbruster , Stefan Hajnoczi , Fam Zheng , qemu-devel@nongnu.org, Emanuele Giuseppe Esposito Subject: [PATCH v8 09/20] blockjob: rename notifier callbacks as _locked Date: Wed, 29 Jun 2022 10:15:27 -0400 Message-Id: <20220629141538.3400679-10-eesposit@redhat.com> In-Reply-To: <20220629141538.3400679-1-eesposit@redhat.com> References: <20220629141538.3400679-1-eesposit@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 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=eesposit@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable 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: 1656513543575100001 Content-Type: text/plain; charset="utf-8" They all are called with job_lock held, in job_event_*_locked() Signed-off-by: Emanuele Giuseppe Esposito Reviewed-by: Stefan Hajnoczi --- blockjob.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/blockjob.c b/blockjob.c index 0d59aba439..70952879d8 100644 --- a/blockjob.c +++ b/blockjob.c @@ -247,7 +247,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(); } @@ -367,7 +368,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; @@ -386,7 +388,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; @@ -412,7 +415,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 @@ -424,7 +428,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; @@ -469,11 +474,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 notifier_list_add(&job->job.on_finalize_cancelled, &job->finalize_cancelled_notifier); --=20 2.31.1