From 056550b1eda280f6a3430ac5abcd20c4d420eeaf Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Thu, 7 Jul 2022 15:51:52 +0100 Subject: [PATCH] Revert "FROMGIT: KVM: arm64: vgic: Demote userspace-triggered console prints to kvm_debug()" This reverts commit 60bd62a27a3e45e5cd3dc9ae877eff6c831f2180. Bug: 233587962 Signed-off-by: Will Deacon Change-Id: I18d82a911f6ab65b806eeb9894e72ba302ec779a --- arch/arm64/kvm/vgic/vgic-v2.c | 4 ++-- arch/arm64/kvm/vgic/vgic-v3.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/kvm/vgic/vgic-v2.c b/arch/arm64/kvm/vgic/vgic-v2.c index 645648349c99..8e337a0d7817 100644 --- a/arch/arm64/kvm/vgic/vgic-v2.c +++ b/arch/arm64/kvm/vgic/vgic-v2.c @@ -293,12 +293,12 @@ int vgic_v2_map_resources(struct kvm *kvm) if (IS_VGIC_ADDR_UNDEF(dist->vgic_dist_base) || IS_VGIC_ADDR_UNDEF(dist->vgic_cpu_base)) { - kvm_debug("Need to set vgic cpu and dist addresses first\n"); + kvm_err("Need to set vgic cpu and dist addresses first\n"); return -ENXIO; } if (!vgic_v2_check_base(dist->vgic_dist_base, dist->vgic_cpu_base)) { - kvm_debug("VGIC CPU and dist frames overlap\n"); + kvm_err("VGIC CPU and dist frames overlap\n"); return -EINVAL; } diff --git a/arch/arm64/kvm/vgic/vgic-v3.c b/arch/arm64/kvm/vgic/vgic-v3.c index 78cf674c1230..debad4e6e6c9 100644 --- a/arch/arm64/kvm/vgic/vgic-v3.c +++ b/arch/arm64/kvm/vgic/vgic-v3.c @@ -554,12 +554,12 @@ int vgic_v3_map_resources(struct kvm *kvm) } if (IS_VGIC_ADDR_UNDEF(dist->vgic_dist_base)) { - kvm_debug("Need to set vgic distributor addresses first\n"); + kvm_err("Need to set vgic distributor addresses first\n"); return -ENXIO; } if (!vgic_v3_check_base(kvm)) { - kvm_debug("VGIC redist and dist frames overlap\n"); + kvm_err("VGIC redist and dist frames overlap\n"); return -EINVAL; }