[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 26/29] hw/timer: Replace fprintf(stderr, "*\n" wi
From: |
Alistair Francis |
Subject: |
[Qemu-devel] [PATCH v5 26/29] hw/timer: Replace fprintf(stderr, "*\n" with error_report() |
Date: |
Mon, 13 Nov 2017 14:36:04 -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>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
---
V2:
- Split hw patch into individual directories
hw/timer/omap_gptimer.c | 11 ++++++-----
hw/timer/twl92230.c | 2 +-
hw/timer/xilinx_timer.c | 8 ++++----
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/hw/timer/omap_gptimer.c b/hw/timer/omap_gptimer.c
index ae2dc99832..0f064241d3 100644
--- a/hw/timer/omap_gptimer.c
+++ b/hw/timer/omap_gptimer.c
@@ -18,6 +18,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "qemu/osdep.h"
+#include "qemu/error-report.h"
#include "hw/hw.h"
#include "qemu/timer.h"
#include "hw/arm/omap.h"
@@ -356,7 +357,7 @@ static void omap_gp_timer_write(void *opaque, hwaddr addr,
case 0x10: /* TIOCP_CFG */
s->config = value & 0x33d;
if (((value >> 3) & 3) == 3) /* IDLEMODE */
- fprintf(stderr, "%s: illegal IDLEMODE value in TIOCP_CFG\n",
+ error_report("%s: illegal IDLEMODE value in TIOCP_CFG",
__func__);
if (value & 2) /* SOFTRESET */
omap_gp_timer_reset(s);
@@ -394,11 +395,11 @@ static void omap_gp_timer_write(void *opaque, hwaddr addr,
s->ar = (value >> 1) & 1;
s->st = (value >> 0) & 1;
if (s->inout && s->trigger != gpt_trigger_none)
- fprintf(stderr, "%s: GP timer pin must be an output "
- "for this trigger mode\n", __func__);
+ error_report("%s: GP timer pin must be an output "
+ "for this trigger mode", __func__);
if (!s->inout && s->capture != gpt_capture_none)
- fprintf(stderr, "%s: GP timer pin must be an input "
- "for this capture mode\n", __func__);
+ error_report("%s: GP timer pin must be an input "
+ "for this capture mode", __func__);
if (s->trigger == gpt_trigger_none)
omap_gp_timer_out(s, s->scpwm);
/* TODO: make sure this doesn't overflow 32-bits */
diff --git a/hw/timer/twl92230.c b/hw/timer/twl92230.c
index ef116c636c..18880884c6 100644
--- a/hw/timer/twl92230.c
+++ b/hw/timer/twl92230.c
@@ -614,7 +614,7 @@ static void menelaus_write(void *opaque, uint8_t addr,
uint8_t value)
break;
rtc_badness:
default:
- fprintf(stderr, "%s: bad RTC_UPDATE value %02x\n",
+ error_report("%s: bad RTC_UPDATE value %02x",
__func__, value);
s->status |= 1 << 10; /* RTCERR */
menelaus_update(s);
diff --git a/hw/timer/xilinx_timer.c b/hw/timer/xilinx_timer.c
index 59439c05be..a80bba846b 100644
--- a/hw/timer/xilinx_timer.c
+++ b/hw/timer/xilinx_timer.c
@@ -127,7 +127,7 @@ timer_read(void *opaque, hwaddr addr, unsigned int size)
break;
}
- D(fprintf(stderr, "%s timer=%d %x=%x\n", __func__, timer, addr * 4, r));
+ D(error_report("%s timer=%d %x=%x", __func__, timer, addr * 4, r));
return r;
}
@@ -135,7 +135,7 @@ static void timer_enable(struct xlx_timer *xt)
{
uint64_t count;
- D(fprintf(stderr, "%s timer=%d down=%d\n", __func__,
+ D(error_report("%s timer=%d down=%d", __func__,
xt->nr, xt->regs[R_TCSR] & TCSR_UDT));
ptimer_stop(xt->ptimer);
@@ -160,7 +160,7 @@ timer_write(void *opaque, hwaddr addr,
addr >>= 2;
timer = timer_from_addr(addr);
xt = &t->timers[timer];
- D(fprintf(stderr, "%s addr=%x val=%x (timer=%d off=%d)\n",
+ D(error_report("%s addr=%x val=%x (timer=%d off=%d)",
__func__, addr * 4, value, timer, addr & 3));
/* Further decoding to address a specific timers reg. */
addr &= 3;
@@ -197,7 +197,7 @@ static void timer_hit(void *opaque)
{
struct xlx_timer *xt = opaque;
struct timerblock *t = xt->parent;
- D(fprintf(stderr, "%s %d\n", __func__, xt->nr));
+ D(error_report("%s %d", __func__, xt->nr));
xt->regs[R_TCSR] |= TCSR_TINT;
if (xt->regs[R_TCSR] & TCSR_ARHT)
--
2.14.1
- Re: [Qemu-devel] [Qemu-trivial] [PATCH v5 17/29] hw/nvram: Replace fprintf(stderr, "*\n" with error_report(), (continued)
- [Qemu-devel] [PATCH v5 21/29] hw/s390x: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/11/13
- [Qemu-devel] [PATCH v5 19/29] hw/pci*: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/11/13
- [Qemu-devel] [PATCH v5 23/29] hw/sd: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/11/13
- [Qemu-devel] [PATCH v5 24/29] hw/sparc*: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/11/13
- [Qemu-devel] [PATCH v5 20/29] hw/ppc: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/11/13
- [Qemu-devel] [PATCH v5 02/29] Replace all occurances of __FUNCTION__ with __func__, Alistair Francis, 2017/11/13
- [Qemu-devel] [PATCH v5 22/29] hw/scsi: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/11/13
- [Qemu-devel] [PATCH v5 29/29] target: Use qemu_log() instead of fprintf(stderr, ...), Alistair Francis, 2017/11/13
- [Qemu-devel] [PATCH v5 26/29] hw/timer: Replace fprintf(stderr, "*\n" with error_report(),
Alistair Francis <=
- [Qemu-devel] [PATCH v5 28/29] tcg: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/11/13
- [Qemu-devel] [PATCH v5 25/29] hw/ssi: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/11/13
- [Qemu-devel] [PATCH v5 27/29] hw/xen*: Replace fprintf(stderr, "*\n" with error_report(), Alistair Francis, 2017/11/13