OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

cpu: do not use object_delete

Browse Source 
CPUs are never added to the composition tree, so delete is achieved
simply by removing the last references to them.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Paolo Bonzini 2013-01-25 14:12:38 +01:00 committed by Anthony Liguori
parent b09995aef1
commit 5c099537a6
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
linux-user/syscall.c
View File

@ -5202,7 +5202,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
NULL, NULL, 0); NULL, NULL, 0);
} }
thread_env = NULL; thread_env = NULL;
object_delete(OBJECT(ENV_GET_CPU(cpu_env))); object_unref(OBJECT(ENV_GET_CPU(cpu_env)));
g_free(ts); g_free(ts);
pthread_exit(NULL); pthread_exit(NULL);
} }

4
target-i386/helper.c
View File

@ -1278,14 +1278,14 @@ X86CPU *cpu_x86_init(const char *cpu_model)
env->cpu_model_str = cpu_model; env->cpu_model_str = cpu_model;
if (cpu_x86_register(cpu, cpu_model) < 0) { if (cpu_x86_register(cpu, cpu_model) < 0) {
object_delete(OBJECT(cpu)); object_unref(OBJECT(cpu));
return NULL; return NULL;
} }
x86_cpu_realize(OBJECT(cpu), &error); x86_cpu_realize(OBJECT(cpu), &error);
if (error) { if (error) {
error_free(error); error_free(error);
object_delete(OBJECT(cpu)); object_unref(OBJECT(cpu));
return NULL; return NULL;
} }
return cpu; return cpu;

2
target-ppc/translate_init.c
View File

@ -10358,7 +10358,7 @@ PowerPCCPU *cpu_ppc_init(const char *cpu_model)
if (err != NULL) { if (err != NULL) {
fprintf(stderr, "%s\n", error_get_pretty(err)); fprintf(stderr, "%s\n", error_get_pretty(err));
error_free(err); error_free(err);
object_delete(OBJECT(cpu)); object_unref(OBJECT(cpu));
return NULL; return NULL;
} }

2
target-sparc/cpu.c
View File

@ -119,7 +119,7 @@ SPARCCPU *cpu_sparc_init(const char *cpu_model)
} }
if (cpu_sparc_register(env, cpu_model) < 0) { if (cpu_sparc_register(env, cpu_model) < 0) {
object_delete(OBJECT(cpu)); object_unref(OBJECT(cpu));
return NULL; return NULL;
} }
qemu_init_vcpu(env); qemu_init_vcpu(env);