[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 10/45] hw/cris: Replace fprintf(stderr, "*\n" wit
From: |
Alistair Francis |
Subject: |
[Qemu-devel] [PATCH v4 10/45] hw/cris: Replace fprintf(stderr, "*\n" with error_report() |
Date: |
Wed, 8 Nov 2017 14:56:55 -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: "Edgar E. Iglesias" <address@hidden>
Reviewed-by: Philippe Mathieu-Daud <address@hidden>
---
V2:
- Split hw patch into individual directories
hw/cris/axis_dev88.c | 3 ++-
hw/cris/boot.c | 6 +++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/hw/cris/axis_dev88.c b/hw/cris/axis_dev88.c
index 9ccc4350a5..df124d5128 100644
--- a/hw/cris/axis_dev88.c
+++ b/hw/cris/axis_dev88.c
@@ -23,6 +23,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/error-report.h"
#include "qapi/error.h"
#include "qemu-common.h"
#include "cpu.h"
@@ -345,7 +346,7 @@ void axisdev88_init(MachineState *machine)
li.cmdline = kernel_cmdline;
cris_load_image(cpu, &li);
} else if (!qtest_enabled()) {
- fprintf(stderr, "Kernel image must be specified\n");
+ error_report("Kernel image must be specified");
exit(1);
}
}
diff --git a/hw/cris/boot.c b/hw/cris/boot.c
index f896ed7f86..fda0a039b8 100644
--- a/hw/cris/boot.c
+++ b/hw/cris/boot.c
@@ -23,6 +23,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/error-report.h"
#include "qemu-common.h"
#include "cpu.h"
#include "hw/hw.h"
@@ -86,14 +87,13 @@ void cris_load_image(CRISCPU *cpu, struct cris_load_info
*li)
}
if (image_size < 0) {
- fprintf(stderr, "qemu: could not load kernel '%s'\n",
- li->image_filename);
+ error_report("could not load kernel '%s'", li->image_filename);
exit(1);
}
if (li->cmdline && (kcmdline_len = strlen(li->cmdline))) {
if (kcmdline_len > 256) {
- fprintf(stderr, "Too long CRIS kernel cmdline (max 256)\n");
+ error_report("Too long CRIS kernel cmdline (max 256)");
exit(1);
}
pstrcpy_targphys("cmdline", 0x40000000, 256, li->cmdline);
--
2.14.1
- [Qemu-devel] [PATCH v4 00/45] Remove some of the fprintf(stderr, "*, Alistair Francis, 2017/11/08
- [Qemu-devel] [PATCH v4 03/45] Fixes after renaming __FUNCTION__ to __func__, Alistair Francis, 2017/11/08
- [Qemu-devel] [PATCH v4 01/45] audio: Replace AUDIO_FUNC with __func__, Alistair Francis, 2017/11/08
- [Qemu-devel] [PATCH v4 04/45] tests: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/11/08
- [Qemu-devel] [PATCH v4 07/45] hw/bt: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/11/08
- [Qemu-devel] [PATCH v4 06/45] hw/block: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/11/08
- [Qemu-devel] [PATCH v4 05/45] hw/arm: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/11/08
- [Qemu-devel] [PATCH v4 10/45] hw/cris: Replace fprintf(stderr, "*\n" with error_report(),
Alistair Francis <=
- [Qemu-devel] [PATCH v4 08/45] hw/char: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/11/08
- [Qemu-devel] [PATCH v4 12/45] hw/dma: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/11/08
- [Qemu-devel] [PATCH v4 11/45] hw/display: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/11/08
- [Qemu-devel] [PATCH v4 09/45] hw/core: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/11/08
- [Qemu-devel] [PATCH v4 14/45] hw/i2c: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/11/08
- [Qemu-devel] [PATCH v4 13/45] hw/gpio: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/11/08
- [Qemu-devel] [PATCH v4 16/45] hw/ide: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/11/08