KVM: SVM: Refactor logging of NPT enabled/disabled

Tweak SVM's logging of NPT enabled/disabled to handle the logging in a
single pr_info() in preparation for merging kvm_enable_tdp() and
kvm_disable_tdp() into a single function.

No functional change intended.

Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index e0be6d0..6b7b0f8 100644 (file)
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -1455,16 +1455,14 @@ static __init int svm_hardware_setup(void)
        if (!boot_cpu_has(X86_FEATURE_NPT))
                npt_enabled = false;
 
-       if (npt_enabled && !npt) {
-               printk(KERN_INFO "kvm: Nested Paging disabled\n");
+       if (npt_enabled && !npt)
                npt_enabled = false;
-       }
 
-       if (npt_enabled) {
-               printk(KERN_INFO "kvm: Nested Paging enabled\n");
+       if (npt_enabled)
                kvm_enable_tdp();
-       } else
+       else
                kvm_disable_tdp();
+       pr_info("kvm: Nested Paging %sabled\n", npt_enabled ? "en" : "dis");
 
        if (nrips) {
                if (!boot_cpu_has(X86_FEATURE_NRIPS))