---

yaml --- r: 133661 b: refs/heads/master c: 236de05 h: refs/heads/master i: 133659: eb4e06d v: v3
git-mirror · Mar 24, 2009 · f0d0088 · f0d0088
1 parent 8506b4f
commit f0d0088
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git 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
@@ -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)