]>
Commit | Line | Data |
---|---|---|
23ea0293 | 1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
a0866d18 | 2 | From: Wolfgang Bumiller <w.bumiller@proxmox.com> |
83faa3fe TL |
3 | Date: Mon, 6 Apr 2020 12:16:53 +0200 |
4 | Subject: [PATCH] PVE: monitor: disable oob capability | |
23ea0293 WB |
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 | 20 | diff --git a/monitor/qmp.c b/monitor/qmp.c |
ddbf7a87 | 21 | index 6b8cfcf6d8..3ec67e32d3 100644 |
be901f66 SR |
22 | --- a/monitor/qmp.c |
23 | +++ b/monitor/qmp.c | |
ddbf7a87 | 24 | @@ -519,8 +519,7 @@ void monitor_init_qmp(Chardev *chr, bool pretty, Error **errp) |
83faa3fe | 25 | qemu_chr_fe_set_echo(&mon->common.chr, true); |
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 |