[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 22/25] block_int-common.h: assertions in the callers of BdrvCh
From: |
Emanuele Giuseppe Esposito |
Subject: |
[PATCH v4 22/25] block_int-common.h: assertions in the callers of BdrvChildClass function pointers |
Date: |
Mon, 25 Oct 2021 06:17:32 -0400 |
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
---
block.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/block.c b/block.c
index 40c4729b8d..da80e89ad4 100644
--- a/block.c
+++ b/block.c
@@ -1462,6 +1462,7 @@ const BdrvChildClass child_of_bds = {
AioContext *bdrv_child_get_parent_aio_context(BdrvChild *c)
{
+ assert(qemu_in_main_thread());
return c->klass->get_parent_aio_context(c);
}
@@ -2085,6 +2086,7 @@ bool bdrv_is_writable(BlockDriverState *bs)
static char *bdrv_child_user_desc(BdrvChild *c)
{
+ assert(qemu_in_main_thread());
return c->klass->get_parent_desc(c);
}
@@ -2718,6 +2720,7 @@ static void bdrv_replace_child_noperm(BdrvChild *child,
int drain_saldo;
assert(!child->frozen);
+ assert(qemu_in_main_thread());
if (old_bs && new_bs) {
assert(bdrv_get_aio_context(old_bs) == bdrv_get_aio_context(new_bs));
@@ -2806,6 +2809,8 @@ static void bdrv_attach_child_common_abort(void *opaque)
BdrvChild *child = *s->child;
BlockDriverState *bs = child->bs;
+ assert(qemu_in_main_thread());
+
bdrv_replace_child_noperm(child, NULL);
if (bdrv_get_aio_context(bs) != s->old_child_ctx) {
@@ -3164,6 +3169,7 @@ void bdrv_unref_child(BlockDriverState *parent, BdrvChild
*child)
static void bdrv_parent_cb_change_media(BlockDriverState *bs, bool load)
{
BdrvChild *c;
+ assert(qemu_in_main_thread());
QLIST_FOREACH(c, &bs->parents, next_parent) {
if (c->klass->change_media) {
c->klass->change_media(c, load);
@@ -3655,6 +3661,7 @@ static BlockDriverState *bdrv_open_inherit(const char
*filename,
assert(!child_class || !flags);
assert(!child_class == !parent);
+ assert(qemu_in_main_thread());
if (reference) {
bool options_non_empty = options ? qdict_size(options) : false;
@@ -4041,6 +4048,7 @@ static BlockReopenQueue
*bdrv_reopen_queue_child(BlockReopenQueue *bs_queue,
* important to avoid graph changes between the recursive queuing here and
* bdrv_reopen_multiple(). */
assert(bs->quiesce_counter > 0);
+ assert(qemu_in_main_thread());
if (bs_queue == NULL) {
bs_queue = g_new0(BlockReopenQueue, 1);
@@ -7097,6 +7105,7 @@ void bdrv_set_aio_context_ignore(BlockDriverState *bs,
BdrvChild *child, *parent;
g_assert(qemu_get_current_aio_context() == qemu_get_aio_context());
+ assert(qemu_in_main_thread());
if (old_context == new_context) {
return;
@@ -7173,6 +7182,7 @@ static bool bdrv_parent_can_set_aio_context(BdrvChild *c,
AioContext *ctx,
return true;
}
*ignore = g_slist_prepend(*ignore, c);
+ assert(qemu_in_main_thread());
/*
* A BdrvChildClass that doesn't handle AioContext changes cannot
--
2.27.0
- [PATCH v4 10/25] assertions for blockjob_int.h, (continued)
- [PATCH v4 10/25] assertions for blockjob_int.h, Emanuele Giuseppe Esposito, 2021/10/25
- [PATCH v4 09/25] include/block/blockjob_int.h: split header into I/O and GS API, Emanuele Giuseppe Esposito, 2021/10/25
- [PATCH v4 14/25] include/systemu/blockdev.h: global state API, Emanuele Giuseppe Esposito, 2021/10/25
- [PATCH v4 15/25] assertions for blockdev.h global state API, Emanuele Giuseppe Esposito, 2021/10/25
- [PATCH v4 16/25] include/block/snapshot: global state API + assertions, Emanuele Giuseppe Esposito, 2021/10/25
- [PATCH v4 19/25] block_int-common.h: split function pointers in BlockDriver, Emanuele Giuseppe Esposito, 2021/10/25
- [PATCH v4 13/25] include/sysemu/blockdev.h: move drive_add and inline drive_def, Emanuele Giuseppe Esposito, 2021/10/25
- [PATCH v4 18/25] block/coroutines: I/O API, Emanuele Giuseppe Esposito, 2021/10/25
- [PATCH v4 17/25] block/copy-before-write.h: global state API + assertions, Emanuele Giuseppe Esposito, 2021/10/25
- [PATCH v4 22/25] block_int-common.h: assertions in the callers of BdrvChildClass function pointers,
Emanuele Giuseppe Esposito <=
- [PATCH v4 21/25] block_int-common.h: split function pointers in BdrvChildClass, Emanuele Giuseppe Esposito, 2021/10/25
- [PATCH v4 20/25] block_int-common.h: assertion in the callers of BlockDriver function pointers, Emanuele Giuseppe Esposito, 2021/10/25
- [PATCH v4 25/25] job.h: assertions in the callers of JobDriver funcion pointers, Emanuele Giuseppe Esposito, 2021/10/25
- [PATCH v4 23/25] block-backend-common.h: split function pointers in BlockDevOps, Emanuele Giuseppe Esposito, 2021/10/25
- [PATCH v4 24/25] job.h: split function pointers in JobDriver, Emanuele Giuseppe Esposito, 2021/10/25
- Re: [PATCH v4 00/25] block layer: split block APIs in global state and I/O, Philippe Mathieu-Daudé, 2021/10/25
- Re: [PATCH v4 00/25] block layer: split block APIs in global state and I/O, Stefan Hajnoczi, 2021/10/28