[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PATCH v6 10/29] hw/intc: Replace fprintf(stderr, "*\n" w
From: |
Alistair Francis |
Subject: |
[Qemu-trivial] [PATCH v6 10/29] hw/intc: Replace fprintf(stderr, "*\n" with error_report() |
Date: |
Wed, 20 Dec 2017 09:23:33 -0800 |
Replace a large number of the fprintf(stderr, "*\n" calls with
error_report(). The functions were renamed with these commands and then
compiler issues where manually fixed.
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr,
"\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr,
"\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr,
"\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N; {s|fprintf(stderr,
"\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N; {s|fprintf(stderr,
"\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N; {s|fprintf(stderr,
"\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N; {s|fprintf(stderr,
"\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N; {s|fprintf(stderr,
"\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N; {s|fprintf(stderr,
"\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N; {s|fprintf(stderr,
"\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N; {s|fprintf(stderr,
"\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
Some lines where then manually tweaked to pass checkpatch.
Signed-off-by: Alistair Francis <address@hidden>
Cc: Peter Maydell <address@hidden>
Cc: Christian Borntraeger <address@hidden>
Cc: Cornelia Huck <address@hidden>
Cc: Alexander Graf <address@hidden>
Acked-by: Cornelia Huck <address@hidden> (s390x part)
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
---
V2:
- Split hw patch into individual directories
hw/intc/arm_gic_kvm.c | 12 ++++++------
hw/intc/omap_intc.c | 4 ++--
hw/intc/openpic.c | 1 +
hw/intc/openpic_kvm.c | 8 ++++----
hw/intc/s390_flic_kvm.c | 4 ++--
5 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/hw/intc/arm_gic_kvm.c b/hw/intc/arm_gic_kvm.c
index ae095d08a3..a5478d3e20 100644
--- a/hw/intc/arm_gic_kvm.c
+++ b/hw/intc/arm_gic_kvm.c
@@ -316,12 +316,12 @@ static void kvm_arm_gic_put(GICState *s)
num_cpu = ((reg & 0xe0) >> 5) + 1;
if (num_irq < s->num_irq) {
- fprintf(stderr, "Restoring %u IRQs, but kernel supports max %d\n",
- s->num_irq, num_irq);
+ error_report("Restoring %u IRQs, but kernel supports max %d",
+ s->num_irq, num_irq);
abort();
} else if (num_cpu != s->num_cpu) {
- fprintf(stderr, "Restoring %u CPU interfaces, kernel only has
%d\n",
- s->num_cpu, num_cpu);
+ error_report("Restoring %u CPU interfaces, kernel only has %d",
+ s->num_cpu, num_cpu);
/* Did we not create the VCPUs in the kernel yet? */
abort();
}
@@ -411,8 +411,8 @@ static void kvm_arm_gic_get(GICState *s)
s->num_cpu = ((reg & 0xe0) >> 5) + 1;
if (s->num_irq > GIC_MAXIRQ) {
- fprintf(stderr, "Too many IRQs reported from the kernel: %d\n",
- s->num_irq);
+ error_report("Too many IRQs reported from the kernel: %d",
+ s->num_irq);
abort();
}
diff --git a/hw/intc/omap_intc.c b/hw/intc/omap_intc.c
index 6844c1aa83..7fc239715a 100644
--- a/hw/intc/omap_intc.c
+++ b/hw/intc/omap_intc.c
@@ -539,8 +539,8 @@ static void omap2_inth_write(void *opaque, hwaddr addr,
/* TODO: Make a bitmap (or sizeof(char)map) of access privileges
* for every register, see Chapter 3 and 4 for privileged mode. */
if (value & 1)
- fprintf(stderr, "%s: protection mode enable attempt\n",
- __func__);
+ error_report("%s: protection mode enable attempt",
+ __func__);
return;
case 0x50: /* INTC_IDLE */
diff --git a/hw/intc/openpic.c b/hw/intc/openpic.c
index 9159a06f07..aa18b392e9 100644
--- a/hw/intc/openpic.c
+++ b/hw/intc/openpic.c
@@ -34,6 +34,7 @@
*
*/
#include "qemu/osdep.h"
+#include "qemu/error-report.h"
#include "hw/hw.h"
#include "hw/ppc/mac.h"
#include "hw/pci/pci.h"
diff --git a/hw/intc/openpic_kvm.c b/hw/intc/openpic_kvm.c
index fa83420254..60c784ae86 100644
--- a/hw/intc/openpic_kvm.c
+++ b/hw/intc/openpic_kvm.c
@@ -150,8 +150,8 @@ static void kvm_openpic_region_add(MemoryListener *listener,
ret = ioctl(opp->fd, KVM_SET_DEVICE_ATTR, &attr);
if (ret < 0) {
- fprintf(stderr, "%s: %s %" PRIx64 "\n", __func__,
- strerror(errno), reg_base);
+ error_report("%s: %s %" PRIx64 "", __func__,
+ strerror(errno), reg_base);
}
}
@@ -184,8 +184,8 @@ static void kvm_openpic_region_del(MemoryListener *listener,
ret = ioctl(opp->fd, KVM_SET_DEVICE_ATTR, &attr);
if (ret < 0) {
- fprintf(stderr, "%s: %s %" PRIx64 "\n", __func__,
- strerror(errno), reg_base);
+ error_report("%s: %s %" PRIx64 "", __func__,
+ strerror(errno), reg_base);
}
}
diff --git a/hw/intc/s390_flic_kvm.c b/hw/intc/s390_flic_kvm.c
index d208cb81c4..e710bfdcda 100644
--- a/hw/intc/s390_flic_kvm.c
+++ b/hw/intc/s390_flic_kvm.c
@@ -83,7 +83,7 @@ static void flic_enable_pfault(KVMS390FLICState *flic)
rc = ioctl(flic->fd, KVM_SET_DEVICE_ATTR, &attr);
if (rc) {
- fprintf(stderr, "flic: couldn't enable pfault\n");
+ error_report("flic: couldn't enable pfault");
}
}
@@ -97,7 +97,7 @@ static void flic_disable_wait_pfault(KVMS390FLICState *flic)
rc = ioctl(flic->fd, KVM_SET_DEVICE_ATTR, &attr);
if (rc) {
- fprintf(stderr, "flic: couldn't disable pfault\n");
+ error_report("flic: couldn't disable pfault");
}
}
--
2.14.1
- Re: [Qemu-trivial] [Qemu-devel] [PATCH v6 04/29] hw/arm: Replace fprintf(stderr, "*\n" with error_report(), (continued)
- Re: [Qemu-trivial] [Qemu-devel] [PATCH v6 04/29] hw/arm: Replace fprintf(stderr, "*\n" with error_report(), Thomas Huth, 2017/12/22
- Re: [Qemu-trivial] [Qemu-devel] [PATCH v6 04/29] hw/arm: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/22
- Re: [Qemu-trivial] [Qemu-devel] [PATCH v6 04/29] hw/arm: Replace fprintf(stderr, "*\n" with error_report(), Markus Armbruster, 2017/12/22
- Re: [Qemu-trivial] [Qemu-devel] [PATCH v6 04/29] hw/arm: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/22
[Qemu-trivial] [PATCH v6 06/29] hw/gpio: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
[Qemu-trivial] [PATCH v6 05/29] hw/dma: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
[Qemu-trivial] [PATCH v6 07/29] hw/i2c: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
[Qemu-trivial] [PATCH v6 02/29] Replace all occurances of __FUNCTION__ with __func__, Alistair Francis, 2017/12/20
[Qemu-trivial] [PATCH v6 09/29] hw/ide: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
[Qemu-trivial] [PATCH v6 10/29] hw/intc: Replace fprintf(stderr, "*\n" with error_report(),
Alistair Francis <=
[Qemu-trivial] [PATCH v6 11/29] hw/ipmi: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
[Qemu-trivial] [PATCH v6 12/29] hw/isa: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
[Qemu-trivial] [PATCH v6 13/29] hw/lm32: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
[Qemu-trivial] [PATCH v6 14/29] hw/mips: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
[Qemu-trivial] [PATCH v6 15/29] hw/moxie: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
[Qemu-trivial] [PATCH v6 16/29] hw/nios2: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
[Qemu-trivial] [PATCH v6 18/29] hw/openrisc: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
[Qemu-trivial] [PATCH v6 19/29] hw/pci*: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
[Qemu-trivial] [PATCH v6 17/29] hw/nvram: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
[Qemu-trivial] [PATCH v6 20/29] hw/ppc: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20