From 23ea0293437cfb7e1cbd224d6c1f846d80cca68e Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Thu, 10 Oct 2019 11:03:20 +0200 Subject: [PATCH] disable oob again Signed-off-by: Wolfgang Bumiller --- ...1-PVE-monitor-disable-oob-capability.patch | 38 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 39 insertions(+) create mode 100644 debian/patches/pve/0031-PVE-monitor-disable-oob-capability.patch 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 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 +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 +Signed-off-by: Thomas Lamprecht +--- + 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 97916fc..9e413bc 100644 --- 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