[PATCH v2 58/66] KVM: SVM: Refactor logging of NPT enabled/disabled

Sean Christopherson
2020-03-03T00:00:36Z

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>
---
arch/x86/kvm/svm.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 9dc614cfd129..efc3ec9d8fef 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -1457,16 +1457,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))
--
2.24.1