[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 29/47] hw/nvram: Replace fprintf(stderr, "*\n" wi
From: |
Alistair Francis |
Subject: |
[Qemu-devel] [PATCH v2 29/47] hw/nvram: Replace fprintf(stderr, "*\n" with error_report() |
Date: |
Fri, 29 Sep 2017 17:16:27 -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>
---
V2:
- Split hw patch into individual directories
hw/nvram/eeprom93xx.c | 5 +++--
hw/nvram/fw_cfg.c | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/hw/nvram/eeprom93xx.c b/hw/nvram/eeprom93xx.c
index 2fd0e3c29f..5cad031eba 100644
--- a/hw/nvram/eeprom93xx.c
+++ b/hw/nvram/eeprom93xx.c
@@ -36,6 +36,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/error-report.h"
#include "hw/hw.h"
#include "hw/nvram/eeprom93xx.h"
@@ -105,8 +106,8 @@ static int get_uint16_from_uint8(QEMUFile *f, void *pv,
size_t size,
static int put_unused(QEMUFile *f, void *pv, size_t size, VMStateField *field,
QJSON *vmdesc)
{
- fprintf(stderr, "uint16_from_uint8 is used only for backwards
compatibility.\n");
- fprintf(stderr, "Never should be used to write a new state.\n");
+ error_report("uint16_from_uint8 is used only for backwards
compatibility.");
+ error_report("Never should be used to write a new state.");
exit(0);
return 0;
diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
index e3bd626b8c..cf9a816c0e 100644
--- a/hw/nvram/fw_cfg.c
+++ b/hw/nvram/fw_cfg.c
@@ -515,8 +515,8 @@ static int get_uint32_as_uint16(QEMUFile *f, void *pv,
size_t size,
static int put_unused(QEMUFile *f, void *pv, size_t size, VMStateField *field,
QJSON *vmdesc)
{
- fprintf(stderr, "uint32_as_uint16 is only used for backward
compatibility.\n");
- fprintf(stderr, "This functions shouldn't be called.\n");
+ error_report("uint32_as_uint16 is only used for backward compatibility.");
+ error_report("This functions shouldn't be called.");
return 0;
}
--
2.11.0
- Re: [Qemu-devel] [PATCH v2 20/47] hw/isa: Replace fprintf(stderr, "*\n" with error_report(), (continued)
- [Qemu-devel] [PATCH v2 01/47] Replace all occurances of __FUNCTION__ with __func__, Alistair Francis, 2017/09/29
- [Qemu-devel] [PATCH v2 26/47] hw/moxie: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/09/29
- [Qemu-devel] [PATCH v2 24/47] hw/mips: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/09/29
- [Qemu-devel] [PATCH v2 23/47] hw/microblaze: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/09/29
- [Qemu-devel] [PATCH v2 25/47] hw/misc: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/09/29
- [Qemu-devel] [PATCH v2 29/47] hw/nvram: Replace fprintf(stderr, "*\n" with error_report(),
Alistair Francis <=
- [Qemu-devel] [PATCH v2 28/47] hw/nios2: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/09/29
- [Qemu-devel] [PATCH v2 27/47] hw/net: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/09/29
- [Qemu-devel] [PATCH v2 31/47] hw/pci*: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/09/29
- [Qemu-devel] [PATCH v2 30/47] hw/openrisc: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/09/29
- [Qemu-devel] [PATCH v2 35/47] hw/sd: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/09/29