From bd058db4d1d20a5d637822fd5a916fb0457860c8 Mon Sep 17 00:00:00 2001 From: Joerg Roedel Date: Thu, 7 Feb 2008 13:47:40 +0100 Subject: [PATCH] --- yaml --- r: 93787 b: refs/heads/master c: 6c7dac72d5c7dc0e09512dce865398167be9a8f7 h: refs/heads/master i: 93785: 6062e062ce2eeebb1bd70a9558d7ac8c2075eac3 93783: 44c114dbb6c6cb959fb40bb84231c018a9ab3612 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 8b0214ce05dc..049b3dfa4fc7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e3da3acdb32c1804a5c853feebcc037b7434076f +refs/heads/master: 6c7dac72d5c7dc0e09512dce865398167be9a8f7 diff --git a/trunk/arch/x86/kvm/svm.c b/trunk/arch/x86/kvm/svm.c index c12a75953b5b..fb5d6c2e6a08 100644 --- a/trunk/arch/x86/kvm/svm.c +++ b/trunk/arch/x86/kvm/svm.c @@ -48,6 +48,9 @@ MODULE_LICENSE("GPL"); #define SVM_DEATURE_SVML (1 << 2) static bool npt_enabled = false; +static int npt = 1; + +module_param(npt, int, S_IRUGO); static void kvm_reput_irq(struct vcpu_svm *svm); @@ -418,6 +421,11 @@ static __init int svm_hardware_setup(void) if (!svm_has(SVM_FEATURE_NPT)) npt_enabled = false; + if (npt_enabled && !npt) { + printk(KERN_INFO "kvm: Nested Paging disabled\n"); + npt_enabled = false; + } + if (npt_enabled) printk(KERN_INFO "kvm: Nested Paging enabled\n");