On 10/19/2017 01:16 PM, Alistair Francis wrote:
> 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.
[...]
> ---
> V2:
> - Split hw patch into individual directories
>
> hw/char/mcf_uart.c | 5 +++--
> hw/char/sh_serial.c | 9 +++++----
> 2 files changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/hw/char/mcf_uart.c b/hw/char/mcf_uart.c
> index 56fa402b58..14cb051be9 100644
> --- a/hw/char/mcf_uart.c
> +++ b/hw/char/mcf_uart.c
> @@ -6,6 +6,7 @@
> * This code is licensed under the GPL
> */
> #include "qemu/osdep.h"
> +#include "qemu/error-report.h"
> #include "hw/hw.h"
> #include "hw/sysbus.h"
> #include "hw/m68k/mcf.h"
> @@ -174,7 +175,7 @@ static void mcf_do_command(mcf_uart_state *s, uint8_t cmd)
> mcf_uart_do_tx(s);
> break;
> case 3: /* Reserved. */
> - fprintf(stderr, "mcf_uart: Bad TX command\n");
> + error_report("mcf_uart: Bad TX command");
I'd rather use qemu_log_mask(LOG_GUEST_ERROR,...) here.
> break;
> }
>
> @@ -189,7 +190,7 @@ static void mcf_do_command(mcf_uart_state *s, uint8_t cmd)
> s->rx_enabled = 0;
> break;
> case 3: /* Reserved. */
> - fprintf(stderr, "mcf_uart: Bad RX command\n");
> + error_report("mcf_uart: Bad RX command");
ditto
> break;
> }
> }
> diff --git a/hw/char/sh_serial.c b/hw/char/sh_serial.c
> index 835b5378a0..7bb3f3c70b 100644
> --- a/hw/char/sh_serial.c
> +++ b/hw/char/sh_serial.c
> @@ -25,6 +25,7 @@
> * THE SOFTWARE.
> */
> #include "qemu/osdep.h"
> +#include "qemu/error-report.h"
> #include "hw/hw.h"
> #include "hw/sh4/sh.h"
> #include "chardev/char-fe.h"
> @@ -190,8 +191,8 @@ static void sh_serial_write(void *opaque, hwaddr offs,
> }
> }
>
> - fprintf(stderr, "sh_serial: unsupported write to 0x%02"
> - HWADDR_PRIx "\n", offs);
> + error_report("sh_serial: unsupported write to 0x%02"
> + HWADDR_PRIx "", offs);
and qemu_log_mask(LOG_UNIMP, ...) here
> abort();
> }
>
> @@ -290,8 +291,8 @@ static uint64_t sh_serial_read(void *opaque, hwaddr offs,
> #endif
>
> if (ret & ~((1 << 16) - 1)) {
> - fprintf(stderr, "sh_serial: unsupported read from 0x%02"
> - HWADDR_PRIx "\n", offs);
> + error_report("sh_serial: unsupported read from 0x%02"
> + HWADDR_PRIx "", offs);
ditto
> abort();
> }
>
>
