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>
34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
|
|
Date: Mon, 6 Apr 2020 12:16:53 +0200
|
|
Subject: [PATCH] PVE: monitor: disable oob capability
|
|
|
|
A bisect revealed that commit 8258292e18c3
|
|
("monitor: Remove "x-oob", offer capability "oob" unconditionally")
|
|
causes unexpected hangs when restoring live snapshots from some
|
|
types of block devices (particularly RBD).
|
|
We need to figure out what's happnening there. For now, since we
|
|
had this disabled before and probably don't need it now either,
|
|
disable oob, so we can get a functioning qemu out...
|
|
|
|
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
|
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
---
|
|
monitor/qmp.c | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
diff --git a/monitor/qmp.c b/monitor/qmp.c
|
|
index c15bf1e1fc..04fe25c62c 100644
|
|
--- a/monitor/qmp.c
|
|
+++ b/monitor/qmp.c
|
|
@@ -553,8 +553,7 @@ void monitor_init_qmp(Chardev *chr, bool pretty, Error **errp)
|
|
qemu_chr_fe_set_echo(&mon->common.chr, true);
|
|
|
|
/* Note: we run QMP monitor in I/O thread when @chr supports that */
|
|
- monitor_data_init(&mon->common, true, false,
|
|
- qemu_chr_has_feature(chr, QEMU_CHAR_FEATURE_GCONTEXT));
|
|
+ monitor_data_init(&mon->common, true, false, false);
|
|
|
|
mon->pretty = pretty;
|
|
|