From nobody Sun Feb 8 12:19:39 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1642788856675631.3095314324224; Fri, 21 Jan 2022 10:14:16 -0800 (PST) Received: from localhost ([::1]:36630 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nAyQR-0007Jb-OH for importer@patchew.org; Fri, 21 Jan 2022 13:14:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40880) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAxNH-0007tT-7y for qemu-devel@nongnu.org; Fri, 21 Jan 2022 12:06:55 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:57336) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAxND-0000PO-Kz for qemu-devel@nongnu.org; Fri, 21 Jan 2022 12:06:54 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-427-Z7Mb7HBCP02PiL_8noKNAg-1; Fri, 21 Jan 2022 12:06:44 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 00FA0100C666; Fri, 21 Jan 2022 17:06:42 +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 5FAA87EBE8; Fri, 21 Jan 2022 17:06:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1642784807; 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=GtmnhNJ4KmbPcuIEmy316OsVoHQaNG0bVONwev0byiQ=; b=HYvIB0TqkcPxdxlWWZrOZXG4pWyGlNMbfGHzwM30evWRjcojr2I4Pi0KirxZCy+0hISbuF rFiJcCY52S4N9iZVI2s6NajzzD4bcCxvElHNqqVxHcNDy6XR7vYH00dy2dU57FgMniZ2yo X+PBOnL2Mj8+O5oGN1BGbMlvx7SO75o= X-MC-Unique: Z7Mb7HBCP02PiL_8noKNAg-1 From: Emanuele Giuseppe Esposito To: qemu-block@nongnu.org Subject: [PATCH v6 24/33] block_int-common.h: assertions in the callers of BlockDriver function pointers Date: Fri, 21 Jan 2022 12:05:35 -0500 Message-Id: <20220121170544.2049944-25-eesposit@redhat.com> In-Reply-To: <20220121170544.2049944-1-eesposit@redhat.com> References: <20220121170544.2049944-1-eesposit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eesposit@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=170.10.129.124; envelope-from=eesposit@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.699, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , qemu-devel@nongnu.org, "Denis V. Lunev" , Eric Blake , Emanuele Giuseppe Esposito , Juan Quintela , Daniel Henrique Barboza , Markus Armbruster , Eduardo Habkost , Richard Henderson , Greg Kurz , "Dr. David Alan Gilbert" , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Stefan Hajnoczi , John Snow , David Gibson , Kevin Wolf , Vladimir Sementsov-Ogievskiy , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Hanna Reitz , qemu-ppc@nongnu.org, Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1642788858152100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Emanuele Giuseppe Esposito --- block.c | 18 ++++++++++++++++++ block/create.c | 2 ++ 2 files changed, 20 insertions(+) diff --git a/block.c b/block.c index bad834c86e..448fb9d76f 100644 --- a/block.c +++ b/block.c @@ -526,6 +526,7 @@ static void coroutine_fn bdrv_create_co_entry(void *opa= que) =20 CreateCo *cco =3D opaque; assert(cco->drv); + assert(qemu_in_main_thread()); =20 ret =3D cco->drv->bdrv_co_create_opts(cco->drv, cco->filename, cco->opts, &local_e= rr); @@ -1089,6 +1090,7 @@ int refresh_total_sectors(BlockDriverState *bs, int64= _t hint) static void bdrv_join_options(BlockDriverState *bs, QDict *options, QDict *old_options) { + assert(qemu_in_main_thread()); if (bs->drv && bs->drv->bdrv_join_options) { bs->drv->bdrv_join_options(options, old_options); } else { @@ -1598,6 +1600,7 @@ static int bdrv_open_driver(BlockDriverState *bs, Blo= ckDriver *drv, { Error *local_err =3D NULL; int i, ret; + assert(qemu_in_main_thread()); =20 bdrv_assign_node_name(bs, node_name, &local_err); if (local_err) { @@ -1989,6 +1992,8 @@ static int bdrv_fill_options(QDict **options, const c= har *filename, BlockDriver *drv =3D NULL; Error *local_err =3D NULL; =20 + assert(qemu_in_main_thread()); + /* * Caution: while qdict_get_try_str() is fine, getting non-string * types would require more care. When @options come from @@ -2182,6 +2187,7 @@ static void bdrv_child_perm(BlockDriverState *bs, Blo= ckDriverState *child_bs, uint64_t *nperm, uint64_t *nshared) { assert(bs->drv && bs->drv->bdrv_child_perm); + assert(qemu_in_main_thread()); bs->drv->bdrv_child_perm(bs, c, role, reopen_queue, parent_perm, parent_shared, nperm, nshared); @@ -2267,6 +2273,7 @@ static void bdrv_drv_set_perm_commit(void *opaque) { BlockDriverState *bs =3D opaque; uint64_t cumulative_perms, cumulative_shared_perms; + assert(qemu_in_main_thread()); =20 if (bs->drv->bdrv_set_perm) { bdrv_get_cumulative_perm(bs, &cumulative_perms, @@ -2278,6 +2285,7 @@ static void bdrv_drv_set_perm_commit(void *opaque) static void bdrv_drv_set_perm_abort(void *opaque) { BlockDriverState *bs =3D opaque; + assert(qemu_in_main_thread()); =20 if (bs->drv->bdrv_abort_perm_update) { bs->drv->bdrv_abort_perm_update(bs); @@ -2293,6 +2301,7 @@ static int bdrv_drv_set_perm(BlockDriverState *bs, ui= nt64_t perm, uint64_t shared_perm, Transaction *tran, Error **errp) { + assert(qemu_in_main_thread()); if (!bs->drv) { return 0; } @@ -4354,6 +4363,7 @@ int bdrv_reopen_multiple(BlockReopenQueue *bs_queue, = Error **errp) =20 assert(qemu_get_current_aio_context() =3D=3D qemu_get_aio_context()); assert(bs_queue !=3D NULL); + assert(qemu_in_main_thread()); =20 QTAILQ_FOREACH(bs_entry, bs_queue, entry) { ctx =3D bdrv_get_aio_context(bs_entry->state.bs); @@ -4619,6 +4629,7 @@ static int bdrv_reopen_prepare(BDRVReopenState *reope= n_state, =20 assert(reopen_state !=3D NULL); assert(reopen_state->bs->drv !=3D NULL); + assert(qemu_in_main_thread()); drv =3D reopen_state->bs->drv; =20 /* This function and each driver's bdrv_reopen_prepare() remove @@ -4829,6 +4840,7 @@ static void bdrv_reopen_commit(BDRVReopenState *reope= n_state) bs =3D reopen_state->bs; drv =3D bs->drv; assert(drv !=3D NULL); + assert(qemu_in_main_thread()); =20 /* If there are any driver level actions to take */ if (drv->bdrv_reopen_commit) { @@ -4870,6 +4882,7 @@ static void bdrv_reopen_abort(BDRVReopenState *reopen= _state) assert(reopen_state !=3D NULL); drv =3D reopen_state->bs->drv; assert(drv !=3D NULL); + assert(qemu_in_main_thread()); =20 if (drv->bdrv_reopen_abort) { drv->bdrv_reopen_abort(reopen_state); @@ -4883,6 +4896,7 @@ static void bdrv_close(BlockDriverState *bs) BdrvChild *child, *next; =20 assert(!bs->refcnt); + assert(qemu_in_main_thread()); =20 bdrv_drained_begin(bs); /* complete I/O */ bdrv_flush(bs); @@ -6679,6 +6693,8 @@ static int bdrv_inactivate_recurse(BlockDriverState *= bs) int ret; uint64_t cumulative_perms, cumulative_shared_perms; =20 + assert(qemu_in_main_thread()); + if (!bs->drv) { return -ENOMEDIUM; } @@ -7187,6 +7203,7 @@ static void bdrv_detach_aio_context(BlockDriverState = *bs) BdrvAioNotifier *baf, *baf_tmp; =20 assert(!bs->walking_aio_notifiers); + assert(qemu_in_main_thread()); bs->walking_aio_notifiers =3D true; QLIST_FOREACH_SAFE(baf, &bs->aio_notifiers, list, baf_tmp) { if (baf->deleted) { @@ -7214,6 +7231,7 @@ static void bdrv_attach_aio_context(BlockDriverState = *bs, AioContext *new_context) { BdrvAioNotifier *ban, *ban_tmp; + assert(qemu_in_main_thread()); =20 if (bs->quiesce_counter) { aio_disable_external(new_context); diff --git a/block/create.c b/block/create.c index 89812669df..8e9e807080 100644 --- a/block/create.c +++ b/block/create.c @@ -42,6 +42,8 @@ static int coroutine_fn blockdev_create_run(Job *job, Err= or **errp) BlockdevCreateJob *s =3D container_of(job, BlockdevCreateJob, common); int ret; =20 + assert(qemu_in_main_thread()); + job_progress_set_remaining(&s->common, 1); ret =3D s->drv->bdrv_co_create(s->opts, errp); job_progress_update(&s->common, 1); --=20 2.31.1