Commit 45876e91 authored by Alistair Francis's avatar Alistair Francis Committed by Thomas Huth
Browse files

hw/m68k: Replace fprintf(stderr, "*\n" with error_report() 



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: default avatarAlistair Francis <alistair.francis@xilinx.com>
Reviewed-by: default avatarThomas Huth <huth@tuxfamily.org>
[thuth: Remove "qemu:" prefix from strings]
Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
parent f90ea7ba

hw/m68k/an5206.c

+2 −2
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ static void an5206_init(MachineState *machine) 
        if (qtest_enabled()) {

            return;

        }

        fprintf(stderr, "Kernel image must be specified\n");

        error_report("Kernel image must be specified");

        exit(1);

    }
@@ -83,7 +83,7 @@ static void an5206_init(MachineState *machine) 
        entry = KERNEL_LOAD_ADDR;

    }

    if (kernel_size < 0) {

        fprintf(stderr, "qemu: could not load kernel '%s'\n", kernel_filename);

        error_report("Could not load kernel '%s'", kernel_filename);

        exit(1);

    }

hw/m68k/mcf5206.c

+2 −1
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
 * This code is licensed under the GPL

 */

#include "qemu/osdep.h"

#include "qemu/error-report.h"

#include "qemu-common.h"

#include "cpu.h"

#include "hw/hw.h"
@@ -220,7 +221,7 @@ static void m5206_mbar_update(m5206_mbar_state *s) 
                break;

            default:

                /* Unknown vector.  */

                fprintf(stderr, "Unhandled vector for IRQ %d\n", irq);

                error_report("Unhandled vector for IRQ %d", irq);

                vector = 0xf;

                break;

            }

hw/m68k/mcf5208.c

+4 −3
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
 * This code is licensed under the GPL

 */

#include "qemu/osdep.h"

#include "qemu/error-report.h"

#include "qapi/error.h"

#include "qemu-common.h"

#include "cpu.h"
@@ -257,7 +258,7 @@ static void mcf5208evb_init(MachineState *machine) 
    mcf5208_sys_init(address_space_mem, pic);



    if (nb_nics > 1) {

        fprintf(stderr, "Too many NICs\n");

        error_report("Too many NICs");

        exit(1);

    }

    if (nd_table[0].used) {
@@ -292,7 +293,7 @@ static void mcf5208evb_init(MachineState *machine) 
        if (qtest_enabled()) {

            return;

        }

        fprintf(stderr, "Kernel image must be specified\n");

        error_report("Kernel image must be specified");

        exit(1);

    }
@@ -309,7 +310,7 @@ static void mcf5208evb_init(MachineState *machine) 
        entry = 0x40000000;

    }

    if (kernel_size < 0) {

        fprintf(stderr, "qemu: could not load kernel '%s'\n", kernel_filename);

        error_report("Could not load kernel '%s'", kernel_filename);

        exit(1);

    }