[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 13/29] hw/lm32: Replace fprintf(stderr, "*\n" wit
From: |
Alistair Francis |
Subject: |
[Qemu-devel] [PATCH v5 13/29] hw/lm32: Replace fprintf(stderr, "*\n" with error_report() |
Date: |
Mon, 13 Nov 2017 14:35:16 -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: Michael Walle <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
---
V2:
- Split hw patch into individual directories
hw/lm32/lm32_boards.c | 7 +++----
hw/lm32/milkymist.c | 7 +++----
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c
index 002d638edd..527bcc229c 100644
--- a/hw/lm32/lm32_boards.c
+++ b/hw/lm32/lm32_boards.c
@@ -18,6 +18,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/error-report.h"
#include "qemu-common.h"
#include "cpu.h"
#include "hw/sysbus.h"
@@ -148,8 +149,7 @@ static void lm32_evr_init(MachineState *machine)
}
if (kernel_size < 0) {
- fprintf(stderr, "qemu: could not load kernel '%s'\n",
- kernel_filename);
+ error_report("could not load kernel '%s'", kernel_filename);
exit(1);
}
}
@@ -242,8 +242,7 @@ static void lm32_uclinux_init(MachineState *machine)
}
if (kernel_size < 0) {
- fprintf(stderr, "qemu: could not load kernel '%s'\n",
- kernel_filename);
+ error_report("could not load kernel '%s'", kernel_filename);
exit(1);
}
}
diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c
index d4e765f2eb..85d64fe58d 100644
--- a/hw/lm32/milkymist.c
+++ b/hw/lm32/milkymist.c
@@ -18,6 +18,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/error-report.h"
#include "qemu-common.h"
#include "cpu.h"
#include "hw/sysbus.h"
@@ -145,8 +146,7 @@ milkymist_init(MachineState *machine)
/* if no kernel is given no valid bios rom is a fatal error */
if (!kernel_filename && !dinfo && !bios_filename && !qtest_enabled()) {
- fprintf(stderr, "qemu: could not load Milkymist One bios '%s'\n",
- bios_name);
+ error_report("could not load Milkymist One bios '%s'", bios_name);
exit(1);
}
g_free(bios_filename);
@@ -184,8 +184,7 @@ milkymist_init(MachineState *machine)
}
if (kernel_size < 0) {
- fprintf(stderr, "qemu: could not load kernel '%s'\n",
- kernel_filename);
+ error_report("could not load kernel '%s'", kernel_filename);
exit(1);
}
}
--
2.14.1
- [Qemu-devel] [PATCH v5 00/29] Remove some of the fprintf(stderr, "*, Alistair Francis, 2017/11/13
- [Qemu-devel] [PATCH v5 03/29] Fixes after renaming __FUNCTION__ to __func__, Alistair Francis, 2017/11/13
- [Qemu-devel] [PATCH v5 07/29] hw/i2c: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/11/13
- [Qemu-devel] [PATCH v5 01/29] audio: Replace AUDIO_FUNC with __func__, Alistair Francis, 2017/11/13
- [Qemu-devel] [PATCH v5 05/29] hw/dma: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/11/13
- [Qemu-devel] [PATCH v5 06/29] hw/gpio: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/11/13
- [Qemu-devel] [PATCH v5 10/29] hw/intc: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/11/13
- [Qemu-devel] [PATCH v5 04/29] hw/arm: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/11/13
- [Qemu-devel] [PATCH v5 09/29] hw/ide: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/11/13
- [Qemu-devel] [PATCH v5 11/29] hw/ipmi: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/11/13
- [Qemu-devel] [PATCH v5 13/29] hw/lm32: Replace fprintf(stderr, "*\n" with error_report(),
Alistair Francis <=
- [Qemu-devel] [PATCH v5 12/29] hw/isa: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/11/13
- [Qemu-devel] [PATCH v5 15/29] hw/moxie: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/11/13
- [Qemu-devel] [PATCH v5 16/29] hw/nios2: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/11/13
- [Qemu-devel] [PATCH v5 14/29] hw/mips: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/11/13
- [Qemu-devel] [PATCH v5 18/29] hw/openrisc: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/11/13
- [Qemu-devel] [PATCH v5 17/29] hw/nvram: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/11/13
- [Qemu-devel] [PATCH v5 21/29] hw/s390x: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/11/13