Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

x86/kvm: Change print code to use pr_*() format

pr_*() is preferred than printk(KERN_* ...), after change all the print
in arch/x86/kernel/kvm.c will have "kvm-guest: xxx" style.

No functional change.

Signed-off-by: Zhenzhong Duan <zhenzhong.duan@oracle.com>
Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Radim Krcmar <rkrcmar@redhat.com>
Cc: Sean Christopherson <sean.j.christopherson@intel.com>
Cc: Vitaly Kuznetsov <vkuznets@redhat.com>
Cc: Wanpeng Li <wanpengli@tencent.com>
Cc: Jim Mattson <jmattson@google.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

authored by

Zhenzhong Duan and committed by
Paolo Bonzini
5aefd786 de585020

+13 -9
+13 -9
arch/x86/kernel/kvm.c
··· 7 7 * Authors: Anthony Liguori <aliguori@us.ibm.com> 8 8 */ 9 9 10 + #define pr_fmt(fmt) "kvm-guest: " fmt 11 + 10 12 #include <linux/context_tracking.h> 11 13 #include <linux/init.h> 12 14 #include <linux/irq.h> ··· 308 306 return; 309 307 310 308 wrmsrl(MSR_KVM_STEAL_TIME, (slow_virt_to_phys(st) | KVM_MSR_ENABLED)); 311 - pr_info("kvm-stealtime: cpu %d, msr %llx\n", 312 - cpu, (unsigned long long) slow_virt_to_phys(st)); 309 + pr_info("stealtime: cpu %d, msr %llx\n", cpu, 310 + (unsigned long long) slow_virt_to_phys(st)); 313 311 } 314 312 315 313 static DEFINE_PER_CPU_DECRYPTED(unsigned long, kvm_apic_eoi) = KVM_PV_EOI_DISABLED; ··· 514 512 } else { 515 513 ret = kvm_hypercall4(KVM_HC_SEND_IPI, (unsigned long)ipi_bitmap, 516 514 (unsigned long)(ipi_bitmap >> BITS_PER_LONG), min, icr); 517 - WARN_ONCE(ret < 0, "KVM: failed to send PV IPI: %ld", ret); 515 + WARN_ONCE(ret < 0, "kvm-guest: failed to send PV IPI: %ld", 516 + ret); 518 517 min = max = apic_id; 519 518 ipi_bitmap = 0; 520 519 } ··· 525 522 if (ipi_bitmap) { 526 523 ret = kvm_hypercall4(KVM_HC_SEND_IPI, (unsigned long)ipi_bitmap, 527 524 (unsigned long)(ipi_bitmap >> BITS_PER_LONG), min, icr); 528 - WARN_ONCE(ret < 0, "KVM: failed to send PV IPI: %ld", ret); 525 + WARN_ONCE(ret < 0, "kvm-guest: failed to send PV IPI: %ld", 526 + ret); 529 527 } 530 528 531 529 local_irq_restore(flags); ··· 556 552 { 557 553 apic->send_IPI_mask = kvm_send_ipi_mask; 558 554 apic->send_IPI_mask_allbutself = kvm_send_ipi_mask_allbutself; 559 - pr_info("KVM setup pv IPIs\n"); 555 + pr_info("setup PV IPIs\n"); 560 556 } 561 557 562 558 static void kvm_smp_send_call_func_ipi(const struct cpumask *mask) ··· 671 667 smp_ops.smp_prepare_boot_cpu = kvm_smp_prepare_boot_cpu; 672 668 if (pv_sched_yield_supported()) { 673 669 smp_ops.send_call_func_ipi = kvm_smp_send_call_func_ipi; 674 - pr_info("KVM setup pv sched yield\n"); 670 + pr_info("setup PV sched yield\n"); 675 671 } 676 672 if (cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN, "x86/kvm:online", 677 673 kvm_cpu_online, kvm_cpu_down_prepare) < 0) 678 - pr_err("kvm_guest: Failed to install cpu hotplug callbacks\n"); 674 + pr_err("failed to install cpu hotplug callbacks\n"); 679 675 #else 680 676 sev_map_percpu_data(); 681 677 kvm_guest_cpu_init(); ··· 914 910 void arch_haltpoll_enable(unsigned int cpu) 915 911 { 916 912 if (!kvm_para_has_feature(KVM_FEATURE_POLL_CONTROL)) { 917 - pr_err_once("kvm: host does not support poll control\n"); 918 - pr_err_once("kvm: host upgrade recommended\n"); 913 + pr_err_once("host does not support poll control\n"); 914 + pr_err_once("host upgrade recommended\n"); 919 915 return; 920 916 } 921 917