On 13.11.2017 23:35, 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. [...] > @@ -720,7 +720,7 @@ static DeviceState *ppce500_init_mpic_kvm(PPCE500Params > *params, > > CPU_FOREACH(cs) { > if (kvm_openpic_connect_vcpu(dev, cs)) { > - fprintf(stderr, "%s: failed to connect vcpu to irqchip\n", > + error_report("%s: failed to connect vcpu to irqchip", > __func__);
Wrong indentation. > abort(); > } > @@ -809,7 +809,7 @@ void ppce500_init(MachineState *machine, PPCE500Params > *params) > cs = CPU(cpu); > > if (env->mmu_model != POWERPC_MMU_BOOKE206) { > - fprintf(stderr, "MMU model %i not supported by this machine.\n", > + error_report("MMU model %i not supported by this machine.", > env->mmu_model); Wrong indentation. > exit(1); > } [...] > diff --git a/hw/ppc/mpc8544_guts.c b/hw/ppc/mpc8544_guts.c > index ce1254b5d4..3a2c49e3fd 100644 > --- a/hw/ppc/mpc8544_guts.c > +++ b/hw/ppc/mpc8544_guts.c > @@ -18,6 +18,7 @@ > */ > > #include "qemu/osdep.h" > +#include "qemu/error-report.h" > #include "qemu-common.h" > #include "cpu.h" > #include "hw/hw.h" > @@ -83,7 +84,7 @@ static uint64_t mpc8544_guts_read(void *opaque, hwaddr addr, > value = env->spr[SPR_E500_SVR]; > break; > default: > - fprintf(stderr, "guts: Unknown register read: %x\n", (int)addr); > + error_report("guts: Unknown register read: %x", (int)addr); > break; > } > > @@ -102,7 +103,7 @@ static void mpc8544_guts_write(void *opaque, hwaddr addr, > } > break; > default: > - fprintf(stderr, "guts: Unknown register write: %x = %x\n", > + error_report("guts: Unknown register write: %x = %x", > (int)addr, (unsigned)value); Wrong indentation. > break; > } [...] > diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c > index 693c215108..12f92b9f2c 100644 > --- a/hw/ppc/ppc440_bamboo.c > +++ b/hw/ppc/ppc440_bamboo.c > @@ -12,6 +12,7 @@ > */ > > #include "qemu/osdep.h" > +#include "qemu/error-report.h" > #include "qemu-common.h" > #include "net/net.h" > #include "hw/hw.h" > @@ -80,22 +81,22 @@ static int bamboo_load_device_tree(hwaddr addr, > ret = qemu_fdt_setprop(fdt, "/memory", "reg", mem_reg_property, > sizeof(mem_reg_property)); > if (ret < 0) > - fprintf(stderr, "couldn't set /memory/reg\n"); > + error_report("couldn't set /memory/reg"); > > ret = qemu_fdt_setprop_cell(fdt, "/chosen", "linux,initrd-start", > initrd_base); > if (ret < 0) > - fprintf(stderr, "couldn't set /chosen/linux,initrd-start\n"); > + error_report("couldn't set /chosen/linux,initrd-start"); > > ret = qemu_fdt_setprop_cell(fdt, "/chosen", "linux,initrd-end", > (initrd_base + initrd_size)); > if (ret < 0) > - fprintf(stderr, "couldn't set /chosen/linux,initrd-end\n"); > + error_report("couldn't set /chosen/linux,initrd-end"); > > ret = qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", > kernel_cmdline); > if (ret < 0) > - fprintf(stderr, "couldn't set /chosen/bootargs\n"); > + error_report("couldn't set /chosen/bootargs"); While you're at it, add proper curly braces? > /* Copy data from the host device tree into the guest. Since the guest > can > * directly access the timebase without host involvement, we must expose > @@ -186,7 +187,7 @@ static void bamboo_init(MachineState *machine) > env = &cpu->env; > > if (env->mmu_model != POWERPC_MMU_BOOKE) { > - fprintf(stderr, "MMU model %i not supported by this machine.\n", > + error_report("MMU model %i not supported by this machine.", > env->mmu_model); Wrong indentation. [...] > diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c > index 5ac4f76613..c1cac864c6 100644 > --- a/hw/ppc/virtex_ml507.c > +++ b/hw/ppc/virtex_ml507.c > @@ -187,7 +187,7 @@ static int xilinx_load_device_tree(hwaddr addr, > > r = qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", kernel_cmdline); > if (r < 0) > - fprintf(stderr, "couldn't set /chosen/bootargs\n"); > + error_report("couldn't set /chosen/bootargs"); > cpu_physical_memory_write(addr, fdt, fdt_size); > return fdt_size; > } > @@ -215,7 +215,7 @@ static void virtex_init(MachineState *machine) > env = &cpu->env; > > if (env->mmu_model != POWERPC_MMU_BOOKE) { > - fprintf(stderr, "MMU model %i not supported by this machine.\n", > + error_report("MMU model %i not supported by this machine.", > env->mmu_model); Wrong indentation. > exit(1); > } > Before you resend your series, could you please check *all* patches for correct indentation. I'm getting tired of indicating this ... Thanks, Thomas