Commit 4a44d85e authored by Seiji Aguchi's avatar Seiji Aguchi Committed by Luiz Capitulino
Browse files

Convert stderr message calling error_get_pretty() to error_report() 

Convert stderr messages calling error_get_pretty()
to error_report().

Timestamp is prepended by -msg timstamp option with it.

Per Markus's comment below, A conversion from fprintf() to
error_report() is always an improvement, regardless of
error_get_pretty().

http://marc.info/?l=qemu-devel&m=137513283408601&w=2



But, it is not reasonable to convert them at one time
because fprintf() is used everwhere in qemu.

So, it should be done step by step with avoiding regression.

Signed-off-by: default avatarSeiji Aguchi <seiji.aguchi@hds.com>
Reviewed-by: default avatarLaszlo Ersek <lersek@redhat.com>
Signed-off-by: default avatarLuiz Capitulino <lcapitulino@redhat.com>
parent 9176e8fb

arch_init.c

+2 −2
Original line number Diff line number Diff line
@@ -1125,7 +1125,7 @@ void do_acpitable_option(const QemuOpts *opts) 


    acpi_table_add(opts, &err);

    if (err) {

        fprintf(stderr, "Wrong acpi table provided: %s\n",

        error_report("Wrong acpi table provided: %s",

                     error_get_pretty(err));

        error_free(err);

        exit(1);

hw/char/serial.c

+3 −2
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include "sysemu/char.h"

#include "qemu/timer.h"

#include "exec/address-spaces.h"

#include "qemu/error-report.h"



//#define DEBUG_SERIAL
@@ -696,7 +697,7 @@ SerialState *serial_init(int base, qemu_irq irq, int baudbase, 
    s->chr = chr;

    serial_realize_core(s, &err);

    if (err != NULL) {

        fprintf(stderr, "%s\n", error_get_pretty(err));

        error_report("%s", error_get_pretty(err));

        error_free(err);

        exit(1);

    }
@@ -760,7 +761,7 @@ SerialState *serial_mm_init(MemoryRegion *address_space, 


    serial_realize_core(s, &err);

    if (err != NULL) {

        fprintf(stderr, "%s\n", error_get_pretty(err));

        error_report("%s", error_get_pretty(err));

        error_free(err);

        exit(1);

    }

hw/i386/pc.c

+3 −3
Original line number Diff line number Diff line
@@ -978,7 +978,7 @@ void pc_cpus_init(const char *cpu_model, DeviceState *icc_bridge) 
        cpu = pc_new_cpu(cpu_model, x86_cpu_apic_id_from_index(i),

                         icc_bridge, &error);

        if (error) {

            fprintf(stderr, "%s\n", error_get_pretty(error));

            error_report("%s", error_get_pretty(error));

            error_free(error);

            exit(1);

        }
@@ -1096,7 +1096,7 @@ void pc_acpi_init(const char *default_dsdt) 


        acpi_table_add(opts, &err);

        if (err) {

            fprintf(stderr, "WARNING: failed to load %s: %s\n", filename,

            error_report("WARNING: failed to load %s: %s", filename,

                         error_get_pretty(err));

            error_free(err);

        }

qemu-char.c

+1 −1
Original line number Diff line number Diff line
@@ -3344,7 +3344,7 @@ CharDriverState *qemu_chr_new(const char *label, const char *filename, void (*in 


    chr = qemu_chr_new_from_opts(opts, init, &err);

    if (error_is_set(&err)) {

        fprintf(stderr, "%s\n", error_get_pretty(err));

        error_report("%s", error_get_pretty(err));

        error_free(err);

    }

    if (chr && qemu_opt_get_bool(opts, "mux", 0)) {

target-i386/cpu.c

+1 −1
Original line number Diff line number Diff line
@@ -1852,7 +1852,7 @@ X86CPU *cpu_x86_init(const char *cpu_model) 


out:

    if (error) {

        fprintf(stderr, "%s\n", error_get_pretty(error));

        error_report("%s", error_get_pretty(error));

        error_free(error);

        if (cpu != NULL) {

            object_unref(OBJECT(cpu));