Use error_prefix() and error_report_err() as appropriate. Cc: Alexander Graf <ag...@suse.de> Cc: qemu-...@nongnu.org Signed-off-by: Peter Crosthwaite <crosthwaite.pe...@gmail.com> ---
hw/ppc/e500.c | 4 ++-- hw/ppc/spapr.c | 4 ++-- hw/ppc/spapr_drc.c | 6 ++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index d300846..798e03d 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -751,8 +751,8 @@ static qemu_irq *ppce500_init_mpic(MachineState *machine, PPCE500Params *params, dev = ppce500_init_mpic_kvm(params, irqs, &err); } if (machine_kernel_irqchip_required(machine) && !dev) { - error_report("kernel_irqchip requested but unavailable: %s", - error_get_pretty(err)); + error_prefix(err, "kernel_irqchip requested but unavailable: "); + error_report_err(err); exit(1); } } diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index bf0c64f..0cbca9f 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -121,8 +121,8 @@ static XICSState *xics_system_init(MachineState *machine, icp = try_create_xics(TYPE_KVM_XICS, nr_servers, nr_irqs, &err); } if (machine_kernel_irqchip_required(machine) && !icp) { - error_report("kernel_irqchip requested but unavailable: %s", - error_get_pretty(err)); + error_prefix(err, "kernel_irqchip requested but unavailable: "); + error_report_err(err); } } diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c index ee87432..9837ef2 100644 --- a/hw/ppc/spapr_drc.c +++ b/hw/ppc/spapr_drc.c @@ -418,8 +418,7 @@ static void realize(DeviceState *d, Error **errp) object_property_add_alias(root_container, link_name, drc->owner, child_name, &err); if (err) { - error_report("%s", error_get_pretty(err)); - error_free(err); + error_report_err(err); object_unref(OBJECT(drc)); } g_free(child_name); @@ -439,8 +438,7 @@ static void unrealize(DeviceState *d, Error **errp) snprintf(name, sizeof(name), "%x", drck->get_index(drc)); object_property_del(root_container, name, &err); if (err) { - error_report("%s", error_get_pretty(err)); - error_free(err); + error_report_err(err); object_unref(OBJECT(drc)); } } -- 1.9.1