Commit cd7b87ff authored by Andreas Färber's avatar Andreas Färber
Browse files

target-i386: Fix X86CPU error handling 



Error **errp argument is not for emitting warnings, it means an error
has occurred and the caller should not make any assumptions about the
state of other return values (unless otherwise documented).

Therefore cpu_x86_create() must unref the new X86CPU itself, and
pc_new_cpu() must check for an Error rather than NULL return value.

While at it, clean up a superfluous NULL check.

Reported-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Cc: qemu-stable@nongnu.org
Cc: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent a1fc6246

hw/i386/pc.c

+6 −7
Original line number Diff line number Diff line
@@ -912,21 +912,20 @@ static X86CPU *pc_new_cpu(const char *cpu_model, int64_t apic_id, 
    X86CPU *cpu;

    Error *local_err = NULL;



    cpu = cpu_x86_create(cpu_model, icc_bridge, errp);

    if (!cpu) {

        return cpu;

    cpu = cpu_x86_create(cpu_model, icc_bridge, &local_err);

    if (local_err != NULL) {

        error_propagate(errp, local_err);

        return NULL;

    }



    object_property_set_int(OBJECT(cpu), apic_id, "apic-id", &local_err);

    object_property_set_bool(OBJECT(cpu), true, "realized", &local_err);



    if (local_err) {

        if (cpu != NULL) {

        error_propagate(errp, local_err);

        object_unref(OBJECT(cpu));

        cpu = NULL;

    }

        error_propagate(errp, local_err);

    }

    return cpu;

}

target-i386/cpu.c

+5 −1
Original line number Diff line number Diff line
@@ -1824,7 +1824,11 @@ X86CPU *cpu_x86_create(const char *cpu_model, DeviceState *icc_bridge, 
    }



out:

    if (error != NULL) {

        error_propagate(errp, error);

        object_unref(OBJECT(cpu));

        cpu = NULL;

    }

    g_strfreev(model_pieces);

    return cpu;

}