On 11/08/2017 07:56 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.
>
> 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 were then manually tweaked to pass checkpatch.
>
> Some lines were manually converted to qemu_log_mask(LOG_UNIMP, and two
> abort()'s were removed
>
> Signed-off-by: Alistair Francis <alistair.fran...@xilinx.com>
> Cc: Paolo Bonzini <pbonz...@redhat.com>
> ---
> V4:
> - Remove abort()s from guest accessible code
> - Use qemu_log_mask(LOG_UNIMP,
> V2:
> - Split hw patch into individual directories
>
> hw/char/mcf_uart.c | 5 +++--
> hw/char/sh_serial.c | 11 +++++------
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/hw/char/mcf_uart.c b/hw/char/mcf_uart.c
> index 56fa402b58..1861c9733e 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 "include/qemu/log.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");
> + qemu_log_mask(LOG_GUEST_ERROR, "mcf_uart: Bad TX command");
> 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");
> + qemu_log_mask(LOG_GUEST_ERROR, "mcf_uart: Bad RX command");
> break;
> }
> }
> diff --git a/hw/char/sh_serial.c b/hw/char/sh_serial.c
> index 835b5378a0..fae2d31b4e 100644
> --- a/hw/char/sh_serial.c
> +++ b/hw/char/sh_serial.c
> @@ -25,6 +25,7 @@
> * THE SOFTWARE.
> */
> #include "qemu/osdep.h"
> +#include "include/qemu/log.h"
> #include "hw/hw.h"
> #include "hw/sh4/sh.h"
> #include "chardev/char-fe.h"
> @@ -190,9 +191,8 @@ static void sh_serial_write(void *opaque, hwaddr offs,
> }
> }
>
> - fprintf(stderr, "sh_serial: unsupported write to 0x%02"
> - HWADDR_PRIx "\n", offs);
> - abort();
> + qemu_log_mask(LOG_UNIMP, "sh_serial: unsupported write to 0x%02"
> + HWADDR_PRIx "", offs);
"" :p
> }
>
> static uint64_t sh_serial_read(void *opaque, hwaddr offs,
> @@ -290,9 +290,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);
> - abort();
> + qemu_log_mask(LOG_UNIMP, "sh_serial: unsupported read from 0x%02"
> + HWADDR_PRIx "", offs);
""
Acked-by: Philippe Mathieu-Daudé <f4...@amsat.org>
> }
>
> return ret;
>
