drop patch force-disabling smm
This drops debian/patches/pve/0005-PVE-Config-smm_available-false.patch (and renumbers the remaining patches) From what I could gather, this patch was originally added due to issues with old kernels. Now we have users which seem to run into issues *with* the patch. All this does is toggle an option, and it's available via a qemu CLI option anyway, so if dropping this patch causes issues for some people we can just add an option to qemu-server & UI control smm explicitly. Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com> Cc: Alexandre Derumier <aderumier@odiso.com> Tested-by: Stefan Reiter <s.reiter@proxmox.com>
This commit is contained in:
committed by
Thomas Lamprecht
parent
611b692181
commit
277d33454f
@@ -1,33 +0,0 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
|
||||
Date: Mon, 6 Apr 2020 12:16:53 +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/qmp.c | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/monitor/qmp.c b/monitor/qmp.c
|
||||
index 092c527b6f..0ef7cebb78 100644
|
||||
--- a/monitor/qmp.c
|
||||
+++ b/monitor/qmp.c
|
||||
@@ -506,8 +506,7 @@ void monitor_init_qmp(Chardev *chr, bool pretty, Error **errp)
|
||||
qemu_chr_fe_set_echo(&mon->common.chr, true);
|
||||
|
||||
/* Note: we run QMP monitor in I/O thread when @chr supports that */
|
||||
- monitor_data_init(&mon->common, true, false,
|
||||
- qemu_chr_has_feature(chr, QEMU_CHAR_FEATURE_GCONTEXT));
|
||||
+ monitor_data_init(&mon->common, true, false, false);
|
||||
|
||||
mon->pretty = pretty;
|
||||
|
||||
Reference in New Issue
Block a user