From 9ddefaedf423ec03eadaf17496c14e0d7b2381c8 Mon Sep 17 00:00:00 2001 From: Cornelia Huck Date: Thu, 28 Jul 2022 16:24:46 +0200 Subject: [PATCH 30/32] kvm: don't use perror() without useful errno RH-Author: Cornelia Huck RH-MergeRequest: 110: kvm: don't use perror() without useful errno RH-Commit: [1/1] 20e51aac6767c1f89f74c7d692d1fb7689eff5f0 (cohuck/qemu-kvm-c9s) RH-Bugzilla: 2095608 RH-Acked-by: Eric Auger RH-Acked-by: Thomas Huth RH-Acked-by: Gavin Shan perror() is designed to append the decoded errno value to a string. This, however, only makes sense if we called something that actually sets errno prior to that. For the callers that check for split irqchip support that is not the case, and we end up with confusing error messages that end in "success". Use error_report() instead. Signed-off-by: Cornelia Huck Message-Id: <20220728142446.438177-1-cohuck@redhat.com> Signed-off-by: Paolo Bonzini https://bugzilla.redhat.com/show_bug.cgi?id=2095608 (cherry picked from commit 47c182fe8b03c0c40059fb95840923e65c9bdb4f) Signed-off-by: Cornelia Huck --- accel/kvm/kvm-all.c | 2 +- target/arm/kvm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 5f1377ca04..e9c7947640 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -2254,7 +2254,7 @@ static void kvm_irqchip_create(KVMState *s) ret = kvm_arch_irqchip_create(s); if (ret == 0) { if (s->kernel_irqchip_split == ON_OFF_AUTO_ON) { - perror("Split IRQ chip mode not supported."); + error_report("Split IRQ chip mode not supported."); exit(1); } else { ret = kvm_vm_ioctl(s, KVM_CREATE_IRQCHIP); diff --git a/target/arm/kvm.c b/target/arm/kvm.c index bbf1ce7ba3..0a2ba1f8e3 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -960,7 +960,7 @@ void kvm_arch_init_irq_routing(KVMState *s) int kvm_arch_irqchip_create(KVMState *s) { if (kvm_kernel_irqchip_split()) { - perror("-machine kernel_irqchip=split is not supported on ARM."); + error_report("-machine kernel_irqchip=split is not supported on ARM."); exit(1); } -- 2.31.1