60ae3775bf
No major semantic changes, mostly just deprecations and changed function signatures. Drop the extra/ patches, as they have been applied upstream. The added extra/ patch was accepted upstream[0] but has not been picked up for 5.1. It is required for non-4M aligned backups to work with PBS. [0] https://lists.gnu.org/archive/html/qemu-devel/2020-08/msg01671.html Signed-off-by: Stefan Reiter <s.reiter@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 d433ceae5b..a16cf3532d 100644
|
|
--- a/monitor/qmp.c
|
|
+++ b/monitor/qmp.c
|
|
@@ -409,8 +409,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;
|
|
|