[pve-devel] [PATCH v2 qemu 3/6] PVE: Don't expect complete_cb to be called outside coroutine
Stefan Reiter
s.reiter at proxmox.com
Thu Oct 29 14:10:33 CET 2020
We're at the mercy of the rest of QEMU here, and it sometimes decides to
call pvebackup_complete_cb from a coroutine. This really doesn't matter
to us, so don't assert and crash on it.
Signed-off-by: Stefan Reiter <s.reiter at proxmox.com>
---
v2: unchanged
pve-backup.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/pve-backup.c b/pve-backup.c
index 13a69f9c5a..92eaada0bc 100644
--- a/pve-backup.c
+++ b/pve-backup.c
@@ -318,19 +318,18 @@ static void coroutine_fn pvebackup_co_complete_stream(void *opaque)
static void pvebackup_complete_cb(void *opaque, int ret)
{
- assert(!qemu_in_coroutine());
-
PVEBackupDevInfo *di = opaque;
di->completed_ret = ret;
/*
* Schedule stream cleanup in async coroutine. close_image and finish might
- * take a while, so we can't block on them here.
+ * take a while, so we can't block on them here. This way it also doesn't
+ * matter if we're already running in a coroutine or not.
* Note: di is a pointer to an entry in the global backup_state struct, so
* it stays valid.
*/
Coroutine *co = qemu_coroutine_create(pvebackup_co_complete_stream, di);
- aio_co_schedule(qemu_get_aio_context(), co);
+ aio_co_enter(qemu_get_aio_context(), co);
}
static void coroutine_fn pvebackup_co_cancel(void *opaque)
--
2.20.1
More information about the pve-devel
mailing list