Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea2cdd27 authored by David Hildenbrand's avatar David Hildenbrand Committed by Christian Borntraeger
Browse files

KVM: s390: introduce KMSG_COMPONENT for kvm-s390 



Let's remove "kvm-s390" from our printk messages and make use
of pr_fmt instead.

Also replace one printk() occurrence by a equivalent pr_warn
on the way.

Suggested-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarDavid Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent 61a6df54

arch/s390/kvm/kvm-s390.c

+6 −2
Original line number Diff line number Diff line
@@ -36,6 +36,10 @@ 
#include "kvm-s390.h"

#include "gaccess.h"



#define KMSG_COMPONENT "kvm-s390"

#undef pr_fmt

#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt



#define CREATE_TRACE_POINTS

#include "trace.h"

#include "trace-s390.h"
@@ -2086,7 +2090,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 
	if (!kvm_s390_user_cpu_state_ctrl(vcpu->kvm)) {

		kvm_s390_vcpu_start(vcpu);

	} else if (is_vcpu_stopped(vcpu)) {

		pr_err_ratelimited("kvm-s390: can't run stopped vcpu %d\n",

		pr_err_ratelimited("can't run stopped vcpu %d\n",

				   vcpu->vcpu_id);

		return -EINVAL;

	}
@@ -2617,7 +2621,7 @@ void kvm_arch_commit_memory_region(struct kvm *kvm, 
	rc = gmap_map_segment(kvm->arch.gmap, mem->userspace_addr,

		mem->guest_phys_addr, mem->memory_size);

	if (rc)

		printk(KERN_WARNING "kvm-s390: failed to commit memory region\n");

		pr_warn("failed to commit memory region\n");

	return;

}