disable oob again

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

diff --git a/debian/patches/pve/0031-PVE-monitor-disable-oob-capability.patch b/debian/patches/pve/0031-PVE-monitor-disable-oob-capability.patch
new file mode 100644 (file)
index 0000000..31d7e9e
--- /dev/null
+++ b/debian/patches/pve/0031-PVE-monitor-disable-oob-capability.patch
@@ -0,0 +1,38 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Wolfgang Bumiller <w.bumiller@proxmox.com>
+Date: Tue, 25 Jun 2019 11:17:58 +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.c | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/monitor.c b/monitor.c
+index 4807bbe811..f8d2338667 100644
+--- a/monitor.c
++++ b/monitor.c
+@@ -4605,10 +4605,7 @@ void monitor_init(Chardev *chr, int flags)
+     bool use_readline = flags & MONITOR_USE_READLINE;
+ 
+     /* Note: we run QMP monitor in I/O thread when @chr supports that */
+-    monitor_data_init(mon, false,
+-                      (flags & MONITOR_USE_CONTROL)
+-                      && qemu_chr_has_feature(chr,
+-                                              QEMU_CHAR_FEATURE_GCONTEXT));
++    monitor_data_init(mon, false, false);
+ 
+     qemu_chr_fe_init(&mon->chr, chr, &error_abort);
+     mon->flags = flags;
+-- 
+2.20.1
+

diff --git a/debian/patches/series b/debian/patches/series
index 97916fc922c9a120f58d06be077b442b9d54ba34..9e413bcbf2d9564971800485ba86e0ae3d7c58b0 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -33,3 +33,4 @@ pve/0027-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch
 pve/0028-docs-recommend-use-of-md-clear-feature-on-all-Intel-.patch
 pve/0029-PVE-savevm-async-kick-AIO-wait-on-block-state-write.patch
 pve/0030-PVE-move-snapshot-cleanup-into-bottom-half.patch
+pve/0031-PVE-monitor-disable-oob-capability.patch