aboutsummaryrefslogtreecommitdiff
path: root/block/nvme.c
diff options
context:
space:
mode:
authorEmanuele Giuseppe Esposito <eesposit@redhat.com>2023-01-13 21:42:01 +0100
committerKevin Wolf <kwolf@redhat.com>2023-02-01 16:52:32 +0100
commit09d9fc97f8b0bf30f3c55a5ae3a20f799fd3e5f2 (patch)
treeeb670ff964eaccb9bf8556c943f89d17e731c74d /block/nvme.c
parent8f4974543203bd1e3a77f198ebb2c60d177b1c40 (diff)
downloadqemu-09d9fc97f8b0bf30f3c55a5ae3a20f799fd3e5f2.zip
qemu-09d9fc97f8b0bf30f3c55a5ae3a20f799fd3e5f2.tar.gz
qemu-09d9fc97f8b0bf30f3c55a5ae3a20f799fd3e5f2.tar.bz2
block: Convert bdrv_io_unplug() to co_wrapper
BlockDriver->bdrv_io_unplug is categorized as IO callback, and it currently doesn't run in a coroutine. We should let it take a graph rdlock since the callback traverses the block nodes graph, which however is only possible in a coroutine. The only caller of this function is blk_io_unplug(), therefore make blk_io_unplug() a co_wrapper, so that we're always running in a coroutine where the lock can be taken. Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com> Message-Id: <20230113204212.359076-4-kwolf@redhat.com> Reviewed-by: Emanuele Giuseppe Esposito <eesposit@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block/nvme.c')
-rw-r--r--block/nvme.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/block/nvme.c b/block/nvme.c
index 4c32584..1fe6f98 100644
--- a/block/nvme.c
+++ b/block/nvme.c
@@ -1574,7 +1574,7 @@ static void coroutine_fn nvme_co_io_plug(BlockDriverState *bs)
s->plugged = true;
}
-static void nvme_aio_unplug(BlockDriverState *bs)
+static void coroutine_fn nvme_co_io_unplug(BlockDriverState *bs)
{
BDRVNVMeState *s = bs->opaque;
assert(s->plugged);
@@ -1665,7 +1665,7 @@ static BlockDriver bdrv_nvme = {
.bdrv_attach_aio_context = nvme_attach_aio_context,
.bdrv_co_io_plug = nvme_co_io_plug,
- .bdrv_io_unplug = nvme_aio_unplug,
+ .bdrv_co_io_unplug = nvme_co_io_unplug,
.bdrv_register_buf = nvme_register_buf,
.bdrv_unregister_buf = nvme_unregister_buf,