[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 10/47] hw/cris: Replace fprintf(stderr, "*\n" wit
From: |
Alistair Francis |
Subject: |
[Qemu-devel] [PATCH v2 10/47] hw/cris: Replace fprintf(stderr, "*\n" with error_report() |
Date: |
Fri, 29 Sep 2017 17:15:30 -0700 |
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>
"Edgar E. Iglesias" <address@hidden>
---
V2:
- Split hw patch into individual directories
hw/cris/axis_dev88.c | 3 ++-
hw/cris/boot.c | 5 +++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/hw/cris/axis_dev88.c b/hw/cris/axis_dev88.c
index 5eb552bce2..d121836b69 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"
@@ -349,7 +350,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..f199a13a82 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,14 @@ void cris_load_image(CRISCPU *cpu, struct cris_load_info
*li)
}
if (image_size < 0) {
- fprintf(stderr, "qemu: could not load kernel '%s'\n",
+ error_report("qemu: 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.11.0
- [Qemu-devel] [PATCH v2 02/47] Fixes after renaming __FUNCTION__ to __func__, (continued)
- [Qemu-devel] [PATCH v2 02/47] Fixes after renaming __FUNCTION__ to __func__, Alistair Francis, 2017/09/29
- [Qemu-devel] [PATCH v2 03/47] audio: Replace AUDIO_FUNC with __func__, Alistair Francis, 2017/09/29
- [Qemu-devel] [PATCH v2 07/47] hw/bt: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/09/29
- [Qemu-devel] [PATCH v2 05/47] hw/arm: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/09/29
- [Qemu-devel] [PATCH v2 08/47] hw/char: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/09/29
- [Qemu-devel] [PATCH v2 04/47] tests: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/09/29
- [Qemu-devel] [PATCH v2 06/47] hw/block: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/09/29
- [Qemu-devel] [PATCH v2 10/47] hw/cris: Replace fprintf(stderr, "*\n" with error_report(),
Alistair Francis <=
- [Qemu-devel] [PATCH v2 11/47] hw/display: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/09/29
- [Qemu-devel] [PATCH v2 09/47] hw/core: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/09/29
- [Qemu-devel] [PATCH v2 13/47] hw/gpio: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/09/29
- [Qemu-devel] [PATCH v2 14/47] hw/i2c: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/09/29
- [Qemu-devel] [PATCH v2 12/47] hw/dma: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/09/29
- [Qemu-devel] [PATCH v2 17/47] hw/input: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/09/29
- [Qemu-devel] [PATCH v2 16/47] hw/ide: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/09/29