Commit 5aefd786 authored by Zhenzhong Duan's avatar Zhenzhong Duan Committed by Paolo Bonzini

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: default avatarZhenzhong Duan <zhenzhong.duan@oracle.com>
Reviewed-by: default avatarVitaly 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: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent de585020
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
* Authors: Anthony Liguori <aliguori@us.ibm.com> * Authors: Anthony Liguori <aliguori@us.ibm.com>
*/ */
#define pr_fmt(fmt) "kvm-guest: " fmt
#include <linux/context_tracking.h> #include <linux/context_tracking.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/irq.h> #include <linux/irq.h>
...@@ -306,8 +308,8 @@ static void kvm_register_steal_time(void) ...@@ -306,8 +308,8 @@ static void kvm_register_steal_time(void)
return; return;
wrmsrl(MSR_KVM_STEAL_TIME, (slow_virt_to_phys(st) | KVM_MSR_ENABLED)); wrmsrl(MSR_KVM_STEAL_TIME, (slow_virt_to_phys(st) | KVM_MSR_ENABLED));
pr_info("kvm-stealtime: cpu %d, msr %llx\n", pr_info("stealtime: cpu %d, msr %llx\n", cpu,
cpu, (unsigned long long) slow_virt_to_phys(st)); (unsigned long long) slow_virt_to_phys(st));
} }
static DEFINE_PER_CPU_DECRYPTED(unsigned long, kvm_apic_eoi) = KVM_PV_EOI_DISABLED; static DEFINE_PER_CPU_DECRYPTED(unsigned long, kvm_apic_eoi) = KVM_PV_EOI_DISABLED;
...@@ -512,7 +514,8 @@ static void __send_ipi_mask(const struct cpumask *mask, int vector) ...@@ -512,7 +514,8 @@ static void __send_ipi_mask(const struct cpumask *mask, int vector)
} else { } else {
ret = kvm_hypercall4(KVM_HC_SEND_IPI, (unsigned long)ipi_bitmap, ret = kvm_hypercall4(KVM_HC_SEND_IPI, (unsigned long)ipi_bitmap,
(unsigned long)(ipi_bitmap >> BITS_PER_LONG), min, icr); (unsigned long)(ipi_bitmap >> BITS_PER_LONG), min, icr);
WARN_ONCE(ret < 0, "KVM: failed to send PV IPI: %ld", ret); WARN_ONCE(ret < 0, "kvm-guest: failed to send PV IPI: %ld",
ret);
min = max = apic_id; min = max = apic_id;
ipi_bitmap = 0; ipi_bitmap = 0;
} }
...@@ -522,7 +525,8 @@ static void __send_ipi_mask(const struct cpumask *mask, int vector) ...@@ -522,7 +525,8 @@ static void __send_ipi_mask(const struct cpumask *mask, int vector)
if (ipi_bitmap) { if (ipi_bitmap) {
ret = kvm_hypercall4(KVM_HC_SEND_IPI, (unsigned long)ipi_bitmap, ret = kvm_hypercall4(KVM_HC_SEND_IPI, (unsigned long)ipi_bitmap,
(unsigned long)(ipi_bitmap >> BITS_PER_LONG), min, icr); (unsigned long)(ipi_bitmap >> BITS_PER_LONG), min, icr);
WARN_ONCE(ret < 0, "KVM: failed to send PV IPI: %ld", ret); WARN_ONCE(ret < 0, "kvm-guest: failed to send PV IPI: %ld",
ret);
} }
local_irq_restore(flags); local_irq_restore(flags);
...@@ -552,7 +556,7 @@ static void kvm_setup_pv_ipi(void) ...@@ -552,7 +556,7 @@ static void kvm_setup_pv_ipi(void)
{ {
apic->send_IPI_mask = kvm_send_ipi_mask; apic->send_IPI_mask = kvm_send_ipi_mask;
apic->send_IPI_mask_allbutself = kvm_send_ipi_mask_allbutself; apic->send_IPI_mask_allbutself = kvm_send_ipi_mask_allbutself;
pr_info("KVM setup pv IPIs\n"); pr_info("setup PV IPIs\n");
} }
static void kvm_smp_send_call_func_ipi(const struct cpumask *mask) static void kvm_smp_send_call_func_ipi(const struct cpumask *mask)
...@@ -667,11 +671,11 @@ static void __init kvm_guest_init(void) ...@@ -667,11 +671,11 @@ static void __init kvm_guest_init(void)
smp_ops.smp_prepare_boot_cpu = kvm_smp_prepare_boot_cpu; smp_ops.smp_prepare_boot_cpu = kvm_smp_prepare_boot_cpu;
if (pv_sched_yield_supported()) { if (pv_sched_yield_supported()) {
smp_ops.send_call_func_ipi = kvm_smp_send_call_func_ipi; smp_ops.send_call_func_ipi = kvm_smp_send_call_func_ipi;
pr_info("KVM setup pv sched yield\n"); pr_info("setup PV sched yield\n");
} }
if (cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN, "x86/kvm:online", if (cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN, "x86/kvm:online",
kvm_cpu_online, kvm_cpu_down_prepare) < 0) kvm_cpu_online, kvm_cpu_down_prepare) < 0)
pr_err("kvm_guest: Failed to install cpu hotplug callbacks\n"); pr_err("failed to install cpu hotplug callbacks\n");
#else #else
sev_map_percpu_data(); sev_map_percpu_data();
kvm_guest_cpu_init(); kvm_guest_cpu_init();
...@@ -910,8 +914,8 @@ static void kvm_enable_host_haltpoll(void *i) ...@@ -910,8 +914,8 @@ static void kvm_enable_host_haltpoll(void *i)
void arch_haltpoll_enable(unsigned int cpu) void arch_haltpoll_enable(unsigned int cpu)
{ {
if (!kvm_para_has_feature(KVM_FEATURE_POLL_CONTROL)) { if (!kvm_para_has_feature(KVM_FEATURE_POLL_CONTROL)) {
pr_err_once("kvm: host does not support poll control\n"); pr_err_once("host does not support poll control\n");
pr_err_once("kvm: host upgrade recommended\n"); pr_err_once("host upgrade recommended\n");
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment