]>
Commit | Line | Data |
---|---|---|
23ea0293 | 1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
be901f66 SR |
2 | From: Stefan Reiter <s.reiter@proxmox.com> |
3 | Date: Thu, 14 Nov 2019 14:38:02 +0100 | |
23ea0293 WB |
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 | --- | |
be901f66 SR |
17 | monitor/qmp.c | 3 +-- |
18 | 1 file changed, 1 insertion(+), 2 deletions(-) | |
23ea0293 | 19 | |
be901f66 SR |
20 | diff --git a/monitor/qmp.c b/monitor/qmp.c |
21 | index fb3e66c62a..ad6703dc52 100644 | |
22 | --- a/monitor/qmp.c | |
23 | +++ b/monitor/qmp.c | |
24 | @@ -379,8 +379,7 @@ void monitor_init_qmp(Chardev *chr, bool pretty) | |
25 | MonitorQMP *mon = g_new0(MonitorQMP, 1); | |
23ea0293 WB |
26 | |
27 | /* Note: we run QMP monitor in I/O thread when @chr supports that */ | |
be901f66 SR |
28 | - monitor_data_init(&mon->common, true, false, |
29 | - qemu_chr_has_feature(chr, QEMU_CHAR_FEATURE_GCONTEXT)); | |
30 | + monitor_data_init(&mon->common, true, false, false); | |
31 | ||
32 | mon->pretty = pretty; | |
23ea0293 | 33 |