Hi Alistair,
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.
>
> 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 <alistair.fran...@xilinx.com>
> Cc: qemu-bl...@nongnu.org
> ---
> V2:
> - Split hw patch into individual directories
>
> hw/ide/ahci.c | 6 +++---
> hw/ide/core.c | 2 +-
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
> index c25e293d88..2ed015285a 100644
> --- a/hw/ide/ahci.c
> +++ b/hw/ide/ahci.c
> @@ -410,8 +410,8 @@ static void ahci_mem_write(void *opaque, hwaddr addr,
>
> /* Only aligned reads are allowed on AHCI */
> if (addr & 3) {
> - fprintf(stderr, "ahci: Mis-aligned write to addr 0x"
> - TARGET_FMT_plx "\n", addr);
> + error_report("ahci: Mis-aligned write to addr 0x"
> + TARGET_FMT_plx "", addr);
removing this trailing "":
Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>
> return;
> }
>
> @@ -1053,7 +1053,7 @@ static void process_ncq_command(AHCIState *s, int port,
> uint8_t *cmd_fis,
> g_assert(is_ncq(ncq_fis->command));
> if (ncq_tfs->used) {
> /* error - already in use */
> - fprintf(stderr, "%s: tag %d already used\n", __func__, tag);
> + error_report("%s: tag %d already used", __func__, tag);
> return;
> }
>
> diff --git a/hw/ide/core.c b/hw/ide/core.c
> index 5f1cd3b91f..0ea34f62ba 100644
> --- a/hw/ide/core.c
> +++ b/hw/ide/core.c
> @@ -2762,7 +2762,7 @@ static int ide_drive_pio_pre_save(void *opaque)
>
> idx = transfer_end_table_idx(s->end_transfer_func);
> if (idx == -1) {
> - fprintf(stderr, "%s: invalid end_transfer_func for DRQ_STAT\n",
> + error_report("%s: invalid end_transfer_func for DRQ_STAT",
> __func__);
eventually indent this line?
__func__);
> s->end_transfer_fn_idx = 2;
> } else {
