Commit 6c0f48f5 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'afaerber/tags/qom-cpu-for-anthony' into staging 

QOM CPUState refactorings

* Clean up X86CPU error handling

# gpg: Signature made Tue 06 Aug 2013 01:57:34 PM CDT using RSA key ID 3E7E013F
# gpg: Can't check signature: public key not found

# By Andreas Färber
# Via Andreas Färber
* afaerber/tags/qom-cpu-for-anthony:
  target-i386: Fix X86CPU error handling
parents cafffa54 cd7b87ff

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;

}