]> git.proxmox.com Git - pve-qemu.git/blame - debian/patches/pve/0030-PVE-monitor-disable-oob-capability.patch
bump version to 4.0.1-5
[pve-qemu.git] / debian / patches / pve / 0030-PVE-monitor-disable-oob-capability.patch
CommitLineData
23ea0293
WB
1From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2From: Wolfgang Bumiller <w.bumiller@proxmox.com>
3Date: Tue, 25 Jun 2019 11:17:58 +0200
4Subject: [PATCH] PVE: monitor: disable oob capability
5
6A bisect revealed that commit 8258292e18c3
7("monitor: Remove "x-oob", offer capability "oob" unconditionally")
8causes unexpected hangs when restoring live snapshots from some
9types of block devices (particularly RBD).
10We need to figure out what's happnening there. For now, since we
11had this disabled before and probably don't need it now either,
12disable oob, so we can get a functioning qemu out...
13
14Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
15Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
16---
17 monitor.c | 5 +----
18 1 file changed, 1 insertion(+), 4 deletions(-)
19
20diff --git a/monitor.c b/monitor.c
b8d43c59 21index daadbcdede..0f79a7dfa4 100644
23ea0293
WB
22--- a/monitor.c
23+++ b/monitor.c
b8d43c59 24@@ -4616,10 +4616,7 @@ void monitor_init(Chardev *chr, int flags)
23ea0293
WB
25 bool use_readline = flags & MONITOR_USE_READLINE;
26
27 /* Note: we run QMP monitor in I/O thread when @chr supports that */
28- monitor_data_init(mon, false,
29- (flags & MONITOR_USE_CONTROL)
30- && qemu_chr_has_feature(chr,
31- QEMU_CHAR_FEATURE_GCONTEXT));
32+ monitor_data_init(mon, false, false);
33
34 qemu_chr_fe_init(&mon->chr, chr, &error_abort);
35 mon->flags = flags;