ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

block_int-common.h: assertions in the callers of BdrvChildClass function pointers 

Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Message-Id: <20220303151616.325444-29-eesposit@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Emanuele Giuseppe Esposito 2022-03-03 10:16:13 -05:00 committed by Kevin Wolf
parent abc5a79c64
commit f0c2832703
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
block.c
View File

@ -1497,7 +1497,7 @@ const BdrvChildClass child_of_bds = {
AioContext *bdrv_child_get_parent_aio_context(BdrvChild *c) AioContext *bdrv_child_get_parent_aio_context(BdrvChild *c)
{ {
IO_CODE(); GLOBAL_STATE_CODE();
return c->klass->get_parent_aio_context(c); return c->klass->get_parent_aio_context(c);
} }
@ -2128,6 +2128,7 @@ bool bdrv_is_writable(BlockDriverState *bs)
static char *bdrv_child_user_desc(BdrvChild *c) static char *bdrv_child_user_desc(BdrvChild *c)
{ {
GLOBAL_STATE_CODE();
return c->klass->get_parent_desc(c); return c->klass->get_parent_desc(c);
} }
@ -2844,6 +2845,7 @@ static void bdrv_replace_child_noperm(BdrvChild **childp,
assert(!child->frozen); assert(!child->frozen);
assert(old_bs != new_bs); assert(old_bs != new_bs);
GLOBAL_STATE_CODE();
if (old_bs && new_bs) { if (old_bs && new_bs) {
assert(bdrv_get_aio_context(old_bs) == bdrv_get_aio_context(new_bs)); assert(bdrv_get_aio_context(old_bs) == bdrv_get_aio_context(new_bs));
@ -2940,6 +2942,7 @@ static void bdrv_attach_child_common_abort(void *opaque)
BdrvChild *child = *s->child; BdrvChild *child = *s->child;
BlockDriverState *bs = child->bs; BlockDriverState *bs = child->bs;
GLOBAL_STATE_CODE();
/* /*
* Pass free_empty_child=false, because we still need the child * Pass free_empty_child=false, because we still need the child
* for the AioContext operations on the parent below; those * for the AioContext operations on the parent below; those
@ -3308,6 +3311,7 @@ void bdrv_unref_child(BlockDriverState *parent, BdrvChild *child)
static void bdrv_parent_cb_change_media(BlockDriverState *bs, bool load) static void bdrv_parent_cb_change_media(BlockDriverState *bs, bool load)
{ {
BdrvChild *c; BdrvChild *c;
GLOBAL_STATE_CODE();
QLIST_FOREACH(c, &bs->parents, next_parent) { QLIST_FOREACH(c, &bs->parents, next_parent) {
if (c->klass->change_media) { if (c->klass->change_media) {
c->klass->change_media(c, load); c->klass->change_media(c, load);
@ -3807,6 +3811,7 @@ static BlockDriverState *bdrv_open_inherit(const char *filename,
assert(!child_class || !flags); assert(!child_class || !flags);
assert(!child_class == !parent); assert(!child_class == !parent);
GLOBAL_STATE_CODE();
if (reference) { if (reference) {
bool options_non_empty = options ? qdict_size(options) : false; bool options_non_empty = options ? qdict_size(options) : false;
@ -4193,6 +4198,7 @@ static BlockReopenQueue *bdrv_reopen_queue_child(BlockReopenQueue *bs_queue,
* important to avoid graph changes between the recursive queuing here and * important to avoid graph changes between the recursive queuing here and
* bdrv_reopen_multiple(). */ * bdrv_reopen_multiple(). */
assert(bs->quiesce_counter > 0); assert(bs->quiesce_counter > 0);
GLOBAL_STATE_CODE();
if (bs_queue == NULL) { if (bs_queue == NULL) {
bs_queue = g_new0(BlockReopenQueue, 1); bs_queue = g_new0(BlockReopenQueue, 1);
@ -7327,6 +7333,7 @@ void bdrv_set_aio_context_ignore(BlockDriverState *bs,
BdrvChild *child, *parent; BdrvChild *child, *parent;
g_assert(qemu_get_current_aio_context() == qemu_get_aio_context()); g_assert(qemu_get_current_aio_context() == qemu_get_aio_context());
GLOBAL_STATE_CODE();
if (old_context == new_context) { if (old_context == new_context) {
return; return;
@ -7399,6 +7406,7 @@ void bdrv_set_aio_context_ignore(BlockDriverState *bs,
static bool bdrv_parent_can_set_aio_context(BdrvChild *c, AioContext *ctx, static bool bdrv_parent_can_set_aio_context(BdrvChild *c, AioContext *ctx,
GSList **ignore, Error **errp) GSList **ignore, Error **errp)
{ {
GLOBAL_STATE_CODE();
if (g_slist_find(*ignore, c)) { if (g_slist_find(*ignore, c)) {
return true; return true;
} }