haraldwolff
/
qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

block: Fix AioContext switch for drained node 

When a drained node changes its AioContext, we need to move its
aio_disable_external() to the new context, too.

Without this fix, drain_end will try to reenable the new context, which
has never been disabled, so an assertion failure is triggered.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
stable-4.0
Kevin Wolf 2019-02-08 16:51:17 +01:00
parent 6c75d761d0
commit e64f25f30b
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
block.c
View File

@ -5227,6 +5227,9 @@ void bdrv_detach_aio_context(BlockDriverState *bs)
bdrv_detach_aio_context(child->bs);
}
if (bs->quiesce_counter) {
aio_enable_external(bs->aio_context);
}
bs->aio_context = NULL;
}
@ -5240,6 +5243,10 @@ void bdrv_attach_aio_context(BlockDriverState *bs,
return;
}
if (bs->quiesce_counter) {
aio_disable_external(new_context);
}
bs->aio_context = new_context;
QLIST_FOREACH(child, &bs->children, next) {