cpu = cpu_x86_create(cpu_model, NULL, &error);
if (error) {
- goto out;
+ goto error;
}
- object_property_set_bool(OBJECT(cpu), true, "realized", &error);
+ object_property_set_int(OBJECT(cpu), CPU(cpu)->cpu_index, "apic-id",
+ &error);
+ if (error) {
+ goto error;
+ }
- out:
+ object_property_set_bool(OBJECT(cpu), true, "realized", &error);
if (error) {
- error_report_err(error);
- if (cpu != NULL) {
- object_unref(OBJECT(cpu));
- cpu = NULL;
- }
+ goto error;
}
- return cpu;
+
+ return &cpu->env;
+
+ error:
- error_report("%s", error_get_pretty(error));
- error_free(error);
++ error_report_err(error);
+ if (cpu != NULL) {
+ object_unref(OBJECT(cpu));
+ }
+ return NULL;
}
static void x86_cpu_cpudef_class_init(ObjectClass *oc, void *data)