Message ID | 1349192235-31895-4-git-send-email-imammedo@redhat.com |
---|---|
State | New |
Headers | show |
Am 02.10.2012 17:36, schrieb Igor Mammedov: > Signed-off-by: Igor Mammedov <imammedo@redhat.com> > Acked-by: Andreas Färber <afaerber@suse.de> Thanks, queued on qom-cpu branch: https://github.com/afaerber/qemu-cpu/commits/qom-cpu This is a prerequisite for the APIC initialization error reporting. Andreas
diff --git a/target-i386/helper.c b/target-i386/helper.c index c635667..1d39ba9 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -1243,6 +1243,7 @@ X86CPU *cpu_x86_init(const char *cpu_model) { X86CPU *cpu; CPUX86State *env; + Error *error = NULL; cpu = X86_CPU(object_new(TYPE_X86_CPU)); env = &cpu->env; @@ -1253,8 +1254,12 @@ X86CPU *cpu_x86_init(const char *cpu_model) return NULL; } - x86_cpu_realize(OBJECT(cpu), NULL); - + x86_cpu_realize(OBJECT(cpu), &error); + if (error) { + error_free(error); + object_delete(OBJECT(cpu)); + return NULL; + } return cpu; }