From f0d0088406ef50bac2dc412ec7c23ef82ecdc35a Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Tue, 25 Nov 2008 20:17:10 +0100
Subject: [PATCH] --- yaml --- r: 133661 b: refs/heads/master c:
 236de05553a7ef8f6940de8686ae9bf1272cd2cf h: refs/heads/master i:   133659:
 eb4e06d5dc218b5ccfb5215b01c9ee9cf38d578f v: v3

---
 [refs]                   | 2 +-
 trunk/arch/x86/kvm/svm.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 08b9e79228d4..b33bdc141187 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb6f302edff9da963e687bf6c15dcf88843b1c3b
+refs/heads/master: 236de05553a7ef8f6940de8686ae9bf1272cd2cf
diff --git a/trunk/arch/x86/kvm/svm.c b/trunk/arch/x86/kvm/svm.c
index df5b41192661..0fbbde54ecae 100644
--- a/trunk/arch/x86/kvm/svm.c
+++ b/trunk/arch/x86/kvm/svm.c
@@ -69,6 +69,9 @@ static int npt = 1;
 
 module_param(npt, int, S_IRUGO);
 
+static int nested = 0;
+module_param(nested, int, S_IRUGO);
+
 static void kvm_reput_irq(struct vcpu_svm *svm);
 static void svm_flush_tlb(struct kvm_vcpu *vcpu);
 
@@ -443,6 +446,11 @@ static __init int svm_hardware_setup(void)
 	if (boot_cpu_has(X86_FEATURE_NX))
 		kvm_enable_efer_bits(EFER_NX);
 
+	if (nested) {
+		printk(KERN_INFO "kvm: Nested Virtualization enabled\n");
+		kvm_enable_efer_bits(EFER_SVME);
+	}
+
 	for_each_online_cpu(cpu) {
 		r = svm_cpu_init(cpu);
 		if (r)