[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 15/29] hw/moxie: Replace fprintf(stderr, "*\n" wi
From: |
Alistair Francis |
Subject: |
[Qemu-devel] [PATCH v6 15/29] hw/moxie: Replace fprintf(stderr, "*\n" with error_report() |
Date: |
Wed, 20 Dec 2017 09:24:12 -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: Anthony Green <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
---
V2:
- Split hw patch into individual directories
hw/moxie/moxiesim.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/hw/moxie/moxiesim.c b/hw/moxie/moxiesim.c
index 3c3ba9d8c5..4f8e84a149 100644
--- a/hw/moxie/moxiesim.c
+++ b/hw/moxie/moxiesim.c
@@ -25,6 +25,7 @@
* THE SOFTWARE.
*/
#include "qemu/osdep.h"
+#include "qemu/error-report.h"
#include "qapi/error.h"
#include "qemu-common.h"
#include "cpu.h"
@@ -60,8 +61,8 @@ static void load_kernel(MoxieCPU *cpu, LoaderParams
*loader_params)
0, 0);
if (kernel_size <= 0) {
- fprintf(stderr, "qemu: could not load kernel '%s'\n",
- loader_params->kernel_filename);
+ error_report("could not load kernel '%s'",
+ loader_params->kernel_filename);
exit(1);
}
@@ -74,9 +75,8 @@ static void load_kernel(MoxieCPU *cpu, LoaderParams
*loader_params)
initrd_offset = (kernel_high + ~TARGET_PAGE_MASK)
& TARGET_PAGE_MASK;
if (initrd_offset + initrd_size > loader_params->ram_size) {
- fprintf(stderr,
- "qemu: memory too small for initial ram disk '%s'\n",
- loader_params->initrd_filename);
+ error_report("memory too small for initial ram disk '%s'",
+ loader_params->initrd_filename);
exit(1);
}
initrd_size = load_image_targphys(loader_params->initrd_filename,
@@ -84,8 +84,8 @@ static void load_kernel(MoxieCPU *cpu, LoaderParams
*loader_params)
ram_size);
}
if (initrd_size == (target_ulong)-1) {
- fprintf(stderr, "qemu: could not load initial ram disk '%s'\n",
- loader_params->initrd_filename);
+ error_report("could not load initial ram disk '%s'",
+ loader_params->initrd_filename);
exit(1);
}
}
--
2.14.1
- [Qemu-devel] [PATCH v6 04/29] hw/arm: Replace fprintf(stderr, "*\n" with error_report(), (continued)
- [Qemu-devel] [PATCH v6 04/29] hw/arm: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
- [Qemu-devel] [PATCH v6 07/29] hw/i2c: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
- [Qemu-devel] [PATCH v6 09/29] hw/ide: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
- [Qemu-devel] [PATCH v6 10/29] hw/intc: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
- [Qemu-devel] [PATCH v6 11/29] hw/ipmi: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
- [Qemu-devel] [PATCH v6 12/29] hw/isa: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
- [Qemu-devel] [PATCH v6 13/29] hw/lm32: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
- [Qemu-devel] [PATCH v6 14/29] hw/mips: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
- [Qemu-devel] [PATCH v6 02/29] Replace all occurances of __FUNCTION__ with __func__, Alistair Francis, 2017/12/20
- [Qemu-devel] [PATCH v6 16/29] hw/nios2: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
- [Qemu-devel] [PATCH v6 15/29] hw/moxie: Replace fprintf(stderr, "*\n" with error_report(),
Alistair Francis <=
- [Qemu-devel] [PATCH v6 17/29] hw/nvram: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
- [Qemu-devel] [PATCH v6 19/29] hw/pci*: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
- [Qemu-devel] [PATCH v6 18/29] hw/openrisc: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
- [Qemu-devel] [PATCH v6 21/29] hw/s390x: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
- [Qemu-devel] [PATCH v6 20/29] hw/ppc: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
- [Qemu-devel] [PATCH v6 25/29] hw/ssi: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
- [Qemu-devel] [PATCH v6 23/29] hw/sd: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
- [Qemu-devel] [PATCH v6 24/29] hw/sparc*: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
- [Qemu-devel] [PATCH v6 26/29] hw/timer: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
- [Qemu-devel] [PATCH v6 28/29] tcg: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20