53b56ca781
Changes to other patches are all just metadata/context changes except
for pvebackup_co_prepare() needing to call bdrv_co_unref() rather than
bdrv_unref(), because it is a coroutine itself. This is documented in
d6ee2e324e ("block-coroutine-wrapper: Introduce no_co_wrapper"). The
change is necessary, because one of the stable fixes converts
bdrv_unref and blk_unref into no_co_wrappers (in preparation for a
second patch to fix a hang with the block resize QMP command).
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
65 lines
2.4 KiB
Diff
65 lines
2.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Kevin Wolf <kwolf@redhat.com>
|
|
Date: Thu, 4 May 2023 13:57:32 +0200
|
|
Subject: [PATCH] block: Consistently call bdrv_activate() outside coroutine
|
|
|
|
Migration code can call bdrv_activate() in coroutine context, whereas
|
|
other callers call it outside of coroutines. As it calls other code that
|
|
is not supposed to run in coroutines, standardise on running outside of
|
|
coroutines.
|
|
|
|
This adds a no_co_wrapper to switch to the main loop before calling
|
|
bdrv_activate().
|
|
|
|
Cc: qemu-stable@nongnu.org
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
Message-Id: <20230504115750.54437-3-kwolf@redhat.com>
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
(cherry-picked from commit da4afaff074e56b0fa0d25abf865784148018895)
|
|
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
|
---
|
|
block/block-backend.c | 10 +++++++++-
|
|
include/block/block-global-state.h | 6 +++++-
|
|
2 files changed, 14 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/block/block-backend.c b/block/block-backend.c
|
|
index 55efc735b4..d59f759daf 100644
|
|
--- a/block/block-backend.c
|
|
+++ b/block/block-backend.c
|
|
@@ -2018,7 +2018,15 @@ void blk_activate(BlockBackend *blk, Error **errp)
|
|
return;
|
|
}
|
|
|
|
- bdrv_activate(bs, errp);
|
|
+ /*
|
|
+ * Migration code can call this function in coroutine context, so leave
|
|
+ * coroutine context if necessary.
|
|
+ */
|
|
+ if (qemu_in_coroutine()) {
|
|
+ bdrv_co_activate(bs, errp);
|
|
+ } else {
|
|
+ bdrv_activate(bs, errp);
|
|
+ }
|
|
}
|
|
|
|
bool coroutine_fn blk_co_is_inserted(BlockBackend *blk)
|
|
diff --git a/include/block/block-global-state.h b/include/block/block-global-state.h
|
|
index 399200a9a3..2c312cc774 100644
|
|
--- a/include/block/block-global-state.h
|
|
+++ b/include/block/block-global-state.h
|
|
@@ -166,7 +166,11 @@ int bdrv_amend_options(BlockDriverState *bs_new, QemuOpts *opts,
|
|
BlockDriverState *check_to_replace_node(BlockDriverState *parent_bs,
|
|
const char *node_name, Error **errp);
|
|
|
|
-int bdrv_activate(BlockDriverState *bs, Error **errp);
|
|
+int no_coroutine_fn bdrv_activate(BlockDriverState *bs, Error **errp);
|
|
+
|
|
+int coroutine_fn no_co_wrapper
|
|
+bdrv_co_activate(BlockDriverState *bs, Error **errp);
|
|
+
|
|
void bdrv_activate_all(Error **errp);
|
|
int bdrv_inactivate_all(void);
|
|
|