|
|
@@ -0,0 +1,32 @@
|
|
|
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
+From: Thomas Lamprecht <[email protected]>
|
|
|
+Date: Fri, 7 Jun 2019 21:16:42 +0200
|
|
|
+Subject: [PATCH] Revert "KVM: VMX: enable nested virtualization by default"
|
|
|
+
|
|
|
+This reverts commit 1e58e5e59148916fa43444a406335a990783fb78
|
|
|
+
|
|
|
+As we're not yet there, and this effectively breaks live migration
|
|
|
+for all VMs using host or +vmx which did not manually enabled nesting
|
|
|
+
|
|
|
+Those which already enabled nesting manually have already breakage,
|
|
|
+but that was something to expect. The situation will get better in
|
|
|
+the future (probably post qemu 4.1).
|
|
|
+
|
|
|
+Signed-off-by: Thomas Lamprecht <[email protected]>
|
|
|
+---
|
|
|
+ arch/x86/kvm/vmx/vmx.c | 2 +-
|
|
|
+ 1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
+
|
|
|
+diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
|
|
|
+index c2e017de4541..08bf16f447ab 100644
|
|
|
+--- a/arch/x86/kvm/vmx/vmx.c
|
|
|
++++ b/arch/x86/kvm/vmx/vmx.c
|
|
|
+@@ -106,7 +106,7 @@ module_param(enable_apicv, bool, S_IRUGO);
|
|
|
+ * VMX and be a hypervisor for its own guests. If nested=0, guests may not
|
|
|
+ * use VMX instructions.
|
|
|
+ */
|
|
|
+-static bool __read_mostly nested = 1;
|
|
|
++static bool __read_mostly nested = 0;
|
|
|
+ module_param(nested, bool, S_IRUGO);
|
|
|
+
|
|
|
+ static u64 __read_mostly host_xss;
|