update to 2.7

[pve-qemu-kvm.git] / debian / patches / pve / 0029-smm_available-false.patch

diff --git a/debian/patches/pve/0029-smm_available-false.patch b/debian/patches/pve/0029-smm_available-false.patch
deleted file mode 100644 (file)
index a0a1593..0000000
--- a/debian/patches/pve/0029-smm_available-false.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 3aebb3903e61b8ceb7f0d302f8dfddfe7195c10e Mon Sep 17 00:00:00 2001
-From: Alexandre Derumier <aderumier@odiso.com>
-Date: Tue, 29 Sep 2015 15:37:44 +0200
-Subject: [PATCH 29/55] smm_available = false
-
-Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
----
- hw/i386/pc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hw/i386/pc.c b/hw/i386/pc.c
-index 1225a99..ceae96c 100644
---- a/hw/i386/pc.c
-+++ b/hw/i386/pc.c
-@@ -1839,7 +1839,7 @@ bool pc_machine_is_smm_enabled(PCMachineState *pcms)
-     if (tcg_enabled() || qtest_enabled()) {
-         smm_available = true;
-     } else if (kvm_enabled()) {
--        smm_available = kvm_has_smm();
-+        smm_available = false;
-     }
- 
-     if (smm_available) {
--- 
-2.1.4
-