Received: by 2002:a25:824b:0:0:0:0:0 with SMTP id d11csp8257205ybn; Tue, 1 Oct 2019 05:42:55 -0700 (PDT) X-Google-Smtp-Source: APXvYqz0PKvsEPAxPqaBRgJO2fnx4i6uuYSEfrd0Y1OJi+9xxGMdQEmMe4Z/woVrk3jw94668yz9 X-Received: by 2002:a17:906:fc11:: with SMTP id ov17mr23259433ejb.288.1569933775739; Tue, 01 Oct 2019 05:42:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569933775; cv=none; d=google.com; s=arc-20160816; b=GIh6e3Cl6tjV1XqTRhAz1lIJsYLbwoaXtg8VsvAyf5kja/GfIEvkmrjMBCGu1qHAab k5PK1qvF63tsvykyoTADUpHrScJTtRgNRu4qcw6jxJ28cwdWqfa5TFH6G79nxMLTLiid I+4KKvyNceV8azTu365qLIf5N0zLq8C2NuqV2A4aQhHp3zMIHvlrt7L+Nb7m9QaVhEZd I7XKJSHcSjD+8CkanxTxJ4E7RFlWkAdtqGEyKCgUkgYVbG2hwGnAVDWEkkcBvniOS1tu jlwqvncCZ/oHOl5DxyVnOQgMeF99Giy7IoiW3fYg/D0le+Zc0aM2m1gl8pyU8jObrpYH lrXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=eDTQRxQ6LpMs/7vELk2HTebyriMNj13Xg+/LshFBa30=; b=ZViBXHANmLhYy3tnyCrLC9DlCzfFKi+PBEPvPH0l1+f14t4pUjpryq4yyruoiRugM3 8cSNWigf9NF2uI30Qfv69c5YP1JmCzdBNeJexHBeVYyJijguwMFscc/0NWRvYQxQeCgg t0LT17ywKKbpmefY45wZWlzHzd9m3sNs+I+sRvZHMVWg7PFFD3uoqpH9jNuND0DEmjOU oVgbfouGL3808s6Taykm99oMtuDs0hoU1S6FbV5AOI8w1Ic1s/dbYi2PnzGRw45D2+1v uIPK3WduIbaG+2BjP2CoZcHXDaZxFbZpIs8ln6t99CMHsq6dOWePOi9mildNVnbkBOR7 KdEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2019-08-05 header.b=jRk5rGAA; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i13si8693754edv.182.2019.10.01.05.42.30; Tue, 01 Oct 2019 05:42:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2019-08-05 header.b=jRk5rGAA; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387978AbfJAMle (ORCPT + 99 others); Tue, 1 Oct 2019 08:41:34 -0400 Received: from aserp2120.oracle.com ([141.146.126.78]:33140 "EHLO aserp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726543AbfJAMle (ORCPT ); Tue, 1 Oct 2019 08:41:34 -0400 Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x91CNqMS145658; Tue, 1 Oct 2019 12:40:04 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2019-08-05; bh=eDTQRxQ6LpMs/7vELk2HTebyriMNj13Xg+/LshFBa30=; b=jRk5rGAApPN5hPnErpFedOHIMMIPiUoWwVPmahZ6ZTUOvPDLW/201zf1JJHdvY6c+5tc VZ7LfTaQIiF/eJT1bQp3hQ3Gi6mj5GhLHik4NzsKTan0VolqPthNwD/dy927fuk50Q6X I8wvpaHCLUv4qCoAR03Xf/VR4rJvIYc9++b22LkEptE+SO1WreR+aKuSbaXifwuVU39P KtO6vhwzWwEH/sfpJzDpefafIlkczcLV0Oc8H9rZ6PlltfaRpatyoifTqAq/oQpo8Pf9 kbki31eDc8HT1unhMDI+Q6xdls1miMagLjnmVnwPjWmA/YJhfTpBHLWNHzE0twaSHD4p NA== Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by aserp2120.oracle.com with ESMTP id 2v9yfq5gd9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 01 Oct 2019 12:40:04 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x91COQ7R039803; Tue, 1 Oct 2019 12:40:04 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by aserp3020.oracle.com with ESMTP id 2vbqd0sv07-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 01 Oct 2019 12:40:04 +0000 Received: from abhmp0010.oracle.com (abhmp0010.oracle.com [141.146.116.16]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id x91Ce3PN005830; Tue, 1 Oct 2019 12:40:03 GMT Received: from z2.cn.oracle.com (/10.182.71.205) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 01 Oct 2019 05:40:03 -0700 From: Zhenzhong Duan To: linux-kernel@vger.kernel.org Cc: vkuznets@redhat.com, linux-hyperv@vger.kernel.org, kvm@vger.kernel.org, Zhenzhong Duan , Paolo Bonzini , Radim Krcmar , Sean Christopherson , Wanpeng Li , Jim Mattson , Joerg Roedel , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" Subject: [PATCH v3 2/4] x86/kvm: Change print code to use pr_*() format Date: Mon, 30 Sep 2019 20:44:37 +0800 Message-Id: <1569847479-13201-3-git-send-email-zhenzhong.duan@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1569847479-13201-1-git-send-email-zhenzhong.duan@oracle.com> References: <1569847479-13201-1-git-send-email-zhenzhong.duan@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9396 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=1 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1908290000 definitions=main-1910010114 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9396 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1908290000 definitions=main-1910010114 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org pr_*() is preferred than printk(KERN_* ...), after change all the print in arch/x86/kernel/kvm.c will have "KVM: xxx" style. No functional change. Suggested-by: Vitaly Kuznetsov Signed-off-by: Zhenzhong Duan Cc: Paolo Bonzini Cc: Radim Krcmar Cc: Sean Christopherson Cc: Vitaly Kuznetsov Cc: Wanpeng Li Cc: Jim Mattson Cc: Joerg Roedel Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Borislav Petkov Cc: "H. Peter Anvin" --- arch/x86/kernel/kvm.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c index a4f108d..ce4f578 100644 --- a/arch/x86/kernel/kvm.c +++ b/arch/x86/kernel/kvm.c @@ -7,6 +7,8 @@ * Authors: Anthony Liguori */ +#define pr_fmt(fmt) "KVM: " fmt + #include #include #include @@ -286,8 +288,8 @@ static void kvm_register_steal_time(void) return; wrmsrl(MSR_KVM_STEAL_TIME, (slow_virt_to_phys(st) | KVM_MSR_ENABLED)); - pr_info("kvm-stealtime: cpu %d, msr %llx\n", - cpu, (unsigned long long) slow_virt_to_phys(st)); + pr_info("stealtime: cpu %d, msr %llx\n", cpu, + (unsigned long long) slow_virt_to_phys(st)); } static DEFINE_PER_CPU_DECRYPTED(unsigned long, kvm_apic_eoi) = KVM_PV_EOI_DISABLED; @@ -321,8 +323,7 @@ static void kvm_guest_cpu_init(void) wrmsrl(MSR_KVM_ASYNC_PF_EN, pa); __this_cpu_write(apf_reason.enabled, 1); - printk(KERN_INFO"KVM setup async PF for cpu %d\n", - smp_processor_id()); + pr_info("setup async PF for cpu %d\n", smp_processor_id()); } if (kvm_para_has_feature(KVM_FEATURE_PV_EOI)) { @@ -347,8 +348,7 @@ static void kvm_pv_disable_apf(void) wrmsrl(MSR_KVM_ASYNC_PF_EN, 0); __this_cpu_write(apf_reason.enabled, 0); - printk(KERN_INFO"Unregister pv shared memory for cpu %d\n", - smp_processor_id()); + pr_info("Unregister pv shared memory for cpu %d\n", smp_processor_id()); } static void kvm_pv_guest_cpu_reboot(void *unused) @@ -509,7 +509,7 @@ static void kvm_setup_pv_ipi(void) { apic->send_IPI_mask = kvm_send_ipi_mask; 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) @@ -639,11 +639,11 @@ static void __init kvm_guest_init(void) !kvm_para_has_hint(KVM_HINTS_REALTIME) && kvm_para_has_feature(KVM_FEATURE_STEAL_TIME)) { 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", 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 sev_map_percpu_data(); kvm_guest_cpu_init(); @@ -746,7 +746,7 @@ static __init int kvm_setup_pv_tlb_flush(void) zalloc_cpumask_var_node(per_cpu_ptr(&__pv_tlb_mask, cpu), GFP_KERNEL, cpu_to_node(cpu)); } - pr_info("KVM setup pv remote TLB flush\n"); + pr_info("setup pv remote TLB flush\n"); } return 0; @@ -879,8 +879,8 @@ static void kvm_enable_host_haltpoll(void *i) void arch_haltpoll_enable(unsigned int cpu) { if (!kvm_para_has_feature(KVM_FEATURE_POLL_CONTROL)) { - pr_err_once("kvm: host does not support poll control\n"); - pr_err_once("kvm: host upgrade recommended\n"); + pr_err_once("host does not support poll control\n"); + pr_err_once("host upgrade recommended\n"); return; } -- 1.8.3.1