On 30.09.2017 02:16, 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.
[...]
> @@ -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("qemu: could not load kernel '%s'", kernel_filename);
I just noticed: The "qemu:" prefix should also be dropped when using
error_report() now. I can change that while applying the patch.
> exit(1);
> }
>
[...]
> diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c
> index b9dde75106..2fb5037b72 100644
> --- a/hw/m68k/mcf5208.c
> +++ b/hw/m68k/mcf5208.c
> @@ -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("qemu: could not load kernel '%s'", kernel_filename);
> exit(1);
> }
dito.
Thomas
