10e1093325
Bigger notable changes: * Commit 1a30b0f5d7 ("block: .bdrv_open is non-coroutine and unlocked") broke the PVE backup patches, in particular setting up the backup dump block driver, because bdrv_new_open_driver() cannot be called from a coroutine. To fix it, bdrv_co_open() is used instead, and while it's a much more involved function, the result should be essentially the same. The only difference I noticed is that the BDRV_O_ALLOW_RDWR flag is also set in the resulting bds (block driver state), but that shouldn't hurt. Smaller notable changes: * aio_set_fd_handler() dropped its 'is_external' parameter stating that all callers now pass false in 60f782b6b7 ("aio: remove aio_disable_external() API"). The calls in the PVE patches also passed false, so just drop the parameter too. * global_state_store() does not have a return value anymore, so the user in the PVE savevm-async patch was adapted. For context, see c33f1829f8 ("migration: never fail in global_state_store()"). * Renames affecting the PVE savevm-async patch: migrate_use_block() -> migrate_block() and ram_counters -> mig_stats 9d4b1e5f22 ("migration: Move migrate_use_block() to options.c") aff3f6606d ("migration: Rename ram_counters to mig_stats") Signed-off-by: Fiona Ebner <f.ebner@proxmox.com> Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
30 lines
1.2 KiB
Diff
30 lines
1.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Fiona Ebner <f.ebner@proxmox.com>
|
|
Date: Fri, 5 May 2023 15:30:16 +0200
|
|
Subject: [PATCH] savevm-async: don't hold BQL during setup
|
|
|
|
See commit "migration: for snapshots, hold the BQL during setup
|
|
callbacks" for why. This is separate, because a version of that one
|
|
will hopefully land upstream.
|
|
|
|
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
|
---
|
|
migration/savevm-async.c | 2 --
|
|
1 file changed, 2 deletions(-)
|
|
|
|
diff --git a/migration/savevm-async.c b/migration/savevm-async.c
|
|
index 80624fada8..b1d85a4b41 100644
|
|
--- a/migration/savevm-async.c
|
|
+++ b/migration/savevm-async.c
|
|
@@ -401,10 +401,8 @@ void qmp_savevm_start(const char *statefile, Error **errp)
|
|
snap_state.state = SAVE_STATE_ACTIVE;
|
|
snap_state.finalize_bh = qemu_bh_new(process_savevm_finalize, &snap_state);
|
|
snap_state.co = qemu_coroutine_create(&process_savevm_co, NULL);
|
|
- qemu_mutex_unlock_iothread();
|
|
qemu_savevm_state_header(snap_state.file);
|
|
qemu_savevm_state_setup(snap_state.file);
|
|
- qemu_mutex_lock_iothread();
|
|
|
|
/* Async processing from here on out happens in iohandler context, so let
|
|
* the target bdrv have its home there.
|