[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PATCH v6 17/29] hw/nvram: Replace fprintf(stderr, "*\n"
From: |
Alistair Francis |
Subject: |
[Qemu-trivial] [PATCH v6 17/29] hw/nvram: Replace fprintf(stderr, "*\n" with error_report() |
Date: |
Wed, 20 Dec 2017 09:24:26 -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.
Some of the message in put_unused() was removed and replaced with
g_assert_not_reached() and some of the messages were updated.
Signed-off-by: Alistair Francis <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
---
V3:
- Add g_assert_not_reached() in unused function
V2:
- Split hw patch into individual directories
hw/nvram/eeprom93xx.c | 7 ++++---
hw/nvram/fw_cfg.c | 4 ++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/hw/nvram/eeprom93xx.c b/hw/nvram/eeprom93xx.c
index 2fd0e3c29f..6ffce745ae 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,9 +106,9 @@ 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");
- exit(0);
+ error_report("uint16_from_uint8 is used only for backwards
compatibility.");
+ error_report("It should never be used to write a new state.");
+ g_assert_not_reached();
return 0;
}
diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
index 753ac0e4ea..49375485ef 100644
--- a/hw/nvram/fw_cfg.c
+++ b/hw/nvram/fw_cfg.c
@@ -518,8 +518,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.");
+ g_assert_not_reached();
return 0;
}
--
2.14.1
- [Qemu-trivial] [PATCH v6 09/29] hw/ide: Replace fprintf(stderr, "*\n" with error_report(), (continued)
- [Qemu-trivial] [PATCH v6 09/29] hw/ide: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
- [Qemu-trivial] [PATCH v6 10/29] hw/intc: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
- [Qemu-trivial] [PATCH v6 11/29] hw/ipmi: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
- [Qemu-trivial] [PATCH v6 12/29] hw/isa: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
- [Qemu-trivial] [PATCH v6 13/29] hw/lm32: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
- [Qemu-trivial] [PATCH v6 14/29] hw/mips: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
- [Qemu-trivial] [PATCH v6 15/29] hw/moxie: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
- [Qemu-trivial] [PATCH v6 16/29] hw/nios2: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
- [Qemu-trivial] [PATCH v6 18/29] hw/openrisc: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
- [Qemu-trivial] [PATCH v6 19/29] hw/pci*: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
- [Qemu-trivial] [PATCH v6 17/29] hw/nvram: Replace fprintf(stderr, "*\n" with error_report(),
Alistair Francis <=
- [Qemu-trivial] [PATCH v6 20/29] hw/ppc: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
- [Qemu-trivial] [PATCH v6 21/29] hw/s390x: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
- [Qemu-trivial] [PATCH v6 25/29] hw/ssi: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
- [Qemu-trivial] [PATCH v6 24/29] hw/sparc*: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
- [Qemu-trivial] [PATCH v6 23/29] hw/sd: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
- [Qemu-trivial] [PATCH v6 26/29] hw/timer: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
- [Qemu-trivial] [PATCH v6 28/29] tcg: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
- [Qemu-trivial] [PATCH v6 27/29] hw/xen*: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/12/20
- [Qemu-trivial] [PATCH v6 29/29] target: Use qemu_log() instead of fprintf(stderr, ...), Alistair Francis, 2017/12/20
- Message not available