Re: [Qemu-devel] [PATCH v2 08/47] hw/char: Replace fprintf(stderr, "*\n" with error_report()

[Thomas Huth]

On 30.09.2017 02:15, 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.
> 
> 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>
> Cc: Paolo Bonzini <address@hidden>
> ---
> V2:
>  - Split hw patch into individual directories
> 
>  hw/char/exynos4210_uart.c | 6 +++---
>  hw/char/mcf_uart.c        | 5 +++--
>  hw/char/sh_serial.c       | 9 +++++----
>  3 files changed, 11 insertions(+), 9 deletions(-)
> 
> diff --git a/hw/char/exynos4210_uart.c b/hw/char/exynos4210_uart.c
> index 3957e78abf..a388f01a23 100644
> --- a/hw/char/exynos4210_uart.c
> +++ b/hw/char/exynos4210_uart.c
> @@ -296,7 +296,7 @@ static void 
> exynos4210_uart_update_irq(Exynos4210UartState *s)
>          qemu_irq_raise(s->irq);
>  
>  #if DEBUG_IRQ
> -        fprintf(stderr, "UART%d: IRQ has been raised: %08x\n",
> +        error_report("UART%d: IRQ has been raised: %08x",
>                  s->channel, s->reg[I_(UINTP)]);
>  #endif
>  
> @@ -388,7 +388,7 @@ static void exynos4210_uart_write(void *opaque, hwaddr 
> offset,
>               * qemu_chr_fe_write and background I/O callbacks */
>              qemu_chr_fe_write_all(&s->chr, &ch, 1);
>  #if DEBUG_Tx_DATA
> -            fprintf(stderr, "%c", ch);
> +            error_report("%c", ch);
>  #endif
>              s->reg[I_(UTRSTAT)] |= UTRSTAT_TRANSMITTER_EMPTY |
>                      UTRSTAT_Tx_BUFFER_EMPTY;
> @@ -400,7 +400,7 @@ static void exynos4210_uart_write(void *opaque, hwaddr 
> offset,
>      case UINTP:
>          s->reg[I_(UINTP)] &= ~val;
>          s->reg[I_(UINTSP)] &= ~val;
> -        PRINT_DEBUG("UART%d: UINTP [%04x] have been cleared: %08x\n",
> +        PRINT_DEBUG("UART%d: UINTP [%04x] have been cleared: %08x",
>                      s->channel, offset, s->reg[I_(UINTP)]);
>          exynos4210_uart_update_irq(s);
>          break;

You didn't replace the PRINT_DEBUG macro, did you? So the last change
looks wrong. IMHO it's also sounds wrong to use error_report for all the
DEBUG sections in here, so I'd rather drop the changes to this file
completely.

 Thomas