From: Wolfram Sang <wsa+renesas@sang-engineering.com> To: qemu-devel@nongnu.org Cc: linux-renesas-soc@vger.kernel.org, "Wolfram Sang" <wsa+renesas@sang-engineering.com>, "Philippe Mathieu-Daudé" <f4bug@amsat.org> Subject: [PATCH v3 RESEND 3/3] nvram: at24c: use standard error reporting Date: Sun, 20 May 2018 09:00:37 +0200 [thread overview] Message-ID: <20180520070037.8593-4-wsa+renesas@sang-engineering.com> (raw) In-Reply-To: <20180520070037.8593-1-wsa+renesas@sang-engineering.com> Replace the ERR macro with error_report() because fprintf is deprecated. This also fixes the prefix printed out twice. Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> --- hw/nvram/eeprom_at24c.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/hw/nvram/eeprom_at24c.c b/hw/nvram/eeprom_at24c.c index ab1ef686e2..c35b29e503 100644 --- a/hw/nvram/eeprom_at24c.c +++ b/hw/nvram/eeprom_at24c.c @@ -13,6 +13,7 @@ #include "hw/hw.h" #include "hw/i2c/i2c.h" #include "sysemu/block-backend.h" +#include "qemu/error-report.h" /* #define DEBUG_AT24C */ @@ -22,9 +23,6 @@ #define DPRINTK(FMT, ...) do {} while (0) #endif -#define ERR(FMT, ...) fprintf(stderr, TYPE_AT24C_EE " : " FMT, \ - ## __VA_ARGS__) - #define TYPE_AT24C_EE "at24c-eeprom" #define AT24C_EE(obj) OBJECT_CHECK(EEPROMState, (obj), TYPE_AT24C_EE) @@ -63,8 +61,7 @@ int at24c_eeprom_event(I2CSlave *s, enum i2c_event event) if (ee->blk && ee->changed) { int len = blk_pwrite(ee->blk, 0, ee->mem, ee->rsize, 0); if (len != ee->rsize) { - ERR(TYPE_AT24C_EE - " : failed to write backing file\n"); + error_report("failed to write backing file"); } DPRINTK("Wrote to backing file\n"); } @@ -125,7 +122,7 @@ int at24c_eeprom_init(I2CSlave *i2c) EEPROMState *ee = AT24C_EE(i2c); if (!ee->rsize) { - ERR("rom-size not allowed to be 0\n"); + error_report("rom-size not allowed to be 0"); exit(1); } @@ -135,7 +132,7 @@ int at24c_eeprom_init(I2CSlave *i2c) int64_t len = blk_getlength(ee->blk); if (len != ee->rsize) { - ERR(TYPE_AT24C_EE " : Backing file size %lu != %u\n", + error_report("Backing file size %lu != %u", (unsigned long)len, (unsigned)ee->rsize); exit(1); } @@ -143,8 +140,7 @@ int at24c_eeprom_init(I2CSlave *i2c) if (blk_set_perm(ee->blk, BLK_PERM_CONSISTENT_READ | BLK_PERM_WRITE, BLK_PERM_ALL, &error_fatal) < 0) { - ERR(TYPE_AT24C_EE - " : Backing file incorrect permission\n"); + error_report("Backing file incorrect permission"); exit(1); } } @@ -166,8 +162,7 @@ void at24c_eeprom_reset(DeviceState *state) int len = blk_pread(ee->blk, 0, ee->mem, ee->rsize); if (len != ee->rsize) { - ERR(TYPE_AT24C_EE - " : Failed initial sync with backing file\n"); + error_report("Failed initial sync with backing file"); } DPRINTK("Reset read backing file\n"); } -- 2.11.0
WARNING: multiple messages have this Message-ID (diff)
From: Wolfram Sang <wsa+renesas@sang-engineering.com> To: qemu-devel@nongnu.org Cc: linux-renesas-soc@vger.kernel.org, "Wolfram Sang" <wsa+renesas@sang-engineering.com>, "Philippe Mathieu-Daudé" <f4bug@amsat.org> Subject: [Qemu-devel] [PATCH v3 RESEND 3/3] nvram: at24c: use standard error reporting Date: Sun, 20 May 2018 09:00:37 +0200 [thread overview] Message-ID: <20180520070037.8593-4-wsa+renesas@sang-engineering.com> (raw) In-Reply-To: <20180520070037.8593-1-wsa+renesas@sang-engineering.com> Replace the ERR macro with error_report() because fprintf is deprecated. This also fixes the prefix printed out twice. Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> --- hw/nvram/eeprom_at24c.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/hw/nvram/eeprom_at24c.c b/hw/nvram/eeprom_at24c.c index ab1ef686e2..c35b29e503 100644 --- a/hw/nvram/eeprom_at24c.c +++ b/hw/nvram/eeprom_at24c.c @@ -13,6 +13,7 @@ #include "hw/hw.h" #include "hw/i2c/i2c.h" #include "sysemu/block-backend.h" +#include "qemu/error-report.h" /* #define DEBUG_AT24C */ @@ -22,9 +23,6 @@ #define DPRINTK(FMT, ...) do {} while (0) #endif -#define ERR(FMT, ...) fprintf(stderr, TYPE_AT24C_EE " : " FMT, \ - ## __VA_ARGS__) - #define TYPE_AT24C_EE "at24c-eeprom" #define AT24C_EE(obj) OBJECT_CHECK(EEPROMState, (obj), TYPE_AT24C_EE) @@ -63,8 +61,7 @@ int at24c_eeprom_event(I2CSlave *s, enum i2c_event event) if (ee->blk && ee->changed) { int len = blk_pwrite(ee->blk, 0, ee->mem, ee->rsize, 0); if (len != ee->rsize) { - ERR(TYPE_AT24C_EE - " : failed to write backing file\n"); + error_report("failed to write backing file"); } DPRINTK("Wrote to backing file\n"); } @@ -125,7 +122,7 @@ int at24c_eeprom_init(I2CSlave *i2c) EEPROMState *ee = AT24C_EE(i2c); if (!ee->rsize) { - ERR("rom-size not allowed to be 0\n"); + error_report("rom-size not allowed to be 0"); exit(1); } @@ -135,7 +132,7 @@ int at24c_eeprom_init(I2CSlave *i2c) int64_t len = blk_getlength(ee->blk); if (len != ee->rsize) { - ERR(TYPE_AT24C_EE " : Backing file size %lu != %u\n", + error_report("Backing file size %lu != %u", (unsigned long)len, (unsigned)ee->rsize); exit(1); } @@ -143,8 +140,7 @@ int at24c_eeprom_init(I2CSlave *i2c) if (blk_set_perm(ee->blk, BLK_PERM_CONSISTENT_READ | BLK_PERM_WRITE, BLK_PERM_ALL, &error_fatal) < 0) { - ERR(TYPE_AT24C_EE - " : Backing file incorrect permission\n"); + error_report("Backing file incorrect permission"); exit(1); } } @@ -166,8 +162,7 @@ void at24c_eeprom_reset(DeviceState *state) int len = blk_pread(ee->blk, 0, ee->mem, ee->rsize); if (len != ee->rsize) { - ERR(TYPE_AT24C_EE - " : Failed initial sync with backing file\n"); + error_report("Failed initial sync with backing file"); } DPRINTK("Reset read backing file\n"); } -- 2.11.0
next prev parent reply other threads:[~2018-05-20 7:00 UTC|newest] Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-05-20 7:00 [PATCH v3 RESEND 0/3] nvram: at24c: fix problems related to "rom-size" Wolfram Sang 2018-05-20 7:00 ` [Qemu-devel] " Wolfram Sang 2018-05-20 7:00 ` [PATCH v3 RESEND 1/3] nvram: at24c: prevent segfault by checking "rom-size" Wolfram Sang 2018-05-20 7:00 ` [Qemu-devel] " Wolfram Sang 2018-05-20 7:00 ` [PATCH v3 RESEND 2/3] nvram: at24c: use a sane default for "rom-size" Wolfram Sang 2018-05-20 7:00 ` [Qemu-devel] " Wolfram Sang 2018-05-20 7:00 ` Wolfram Sang [this message] 2018-05-20 7:00 ` [Qemu-devel] [PATCH v3 RESEND 3/3] nvram: at24c: use standard error reporting Wolfram Sang 2018-05-20 13:27 ` Peter Maydell
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20180520070037.8593-4-wsa+renesas@sang-engineering.com \ --to=wsa+renesas@sang-engineering.com \ --cc=f4bug@amsat.org \ --cc=linux-renesas-soc@vger.kernel.org \ --cc=qemu-devel@nongnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.