36 lines
1.4 KiB
Diff
36 lines
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
|
|
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 <w.bumiller@proxmox.com>
|
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
---
|
|
monitor.c | 5 +----
|
|
1 file changed, 1 insertion(+), 4 deletions(-)
|
|
|
|
diff --git a/monitor.c b/monitor.c
|
|
index daadbcdede..0f79a7dfa4 100644
|
|
--- a/monitor.c
|
|
+++ b/monitor.c
|
|
@@ -4616,10 +4616,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;
|