Commit f11235b9 authored by Greg Kurz's avatar Greg Kurz Committed by David Gibson
Browse files

spapr: do proper error propagation in spapr_cpu_core_realize_child() 



This patch changes spapr_cpu_core_realize_child() to have a local error
pointer and use error_propagate() as it is supposed to be done.

Signed-off-by: default avatarGreg Kurz <groug@kaod.org>
Reviewed-by: default avatarBharata B Rao <bharata@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 8e758dee

hw/ppc/spapr_cpu_core.c

+7 −5
Original line number Diff line number Diff line
@@ -262,18 +262,20 @@ out: 


static int spapr_cpu_core_realize_child(Object *child, void *opaque)

{

    Error **errp = opaque;

    Error **errp = opaque, *local_err = NULL;

    sPAPRMachineState *spapr = SPAPR_MACHINE(qdev_get_machine());

    CPUState *cs = CPU(child);

    PowerPCCPU *cpu = POWERPC_CPU(cs);



    object_property_set_bool(child, true, "realized", errp);

    if (*errp) {

    object_property_set_bool(child, true, "realized", &local_err);

    if (local_err) {

        error_propagate(errp, local_err);

        return 1;

    }



    spapr_cpu_init(spapr, cpu, errp);

    if (*errp) {

    spapr_cpu_init(spapr, cpu, &local_err);

    if (local_err) {

        error_propagate(errp, local_err);

        return 1;

    }

    return 0;