]>
Commit | Line | Data |
---|---|---|
23ea0293 WB |
1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
2 | From: Wolfgang Bumiller <w.bumiller@proxmox.com> | |
3 | Date: Tue, 25 Jun 2019 11:17:58 +0200 | |
4 | Subject: [PATCH] PVE: monitor: disable oob capability | |
5 | ||
6 | A bisect revealed that commit 8258292e18c3 | |
7 | ("monitor: Remove "x-oob", offer capability "oob" unconditionally") | |
8 | causes unexpected hangs when restoring live snapshots from some | |
9 | types of block devices (particularly RBD). | |
10 | We need to figure out what's happnening there. For now, since we | |
11 | had this disabled before and probably don't need it now either, | |
12 | disable oob, so we can get a functioning qemu out... | |
13 | ||
14 | Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com> | |
15 | Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com> | |
16 | --- | |
17 | monitor.c | 5 +---- | |
18 | 1 file changed, 1 insertion(+), 4 deletions(-) | |
19 | ||
20 | diff --git a/monitor.c b/monitor.c | |
21 | index 4807bbe811..f8d2338667 100644 | |
22 | --- a/monitor.c | |
23 | +++ b/monitor.c | |
24 | @@ -4605,10 +4605,7 @@ void monitor_init(Chardev *chr, int flags) | |
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; | |
36 | -- | |
37 | 2.20.1 | |
38 |