From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:43599) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TxGWc-0005ZN-1P for qemu-devel@nongnu.org; Mon, 21 Jan 2013 07:30:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TxGWa-0006gr-CR for qemu-devel@nongnu.org; Mon, 21 Jan 2013 07:30:53 -0500 Received: from mail-ee0-f44.google.com ([74.125.83.44]:39720) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TxGWa-0006gk-5a for qemu-devel@nongnu.org; Mon, 21 Jan 2013 07:30:52 -0500 Received: by mail-ee0-f44.google.com with SMTP id l10so2796750eei.17 for ; Mon, 21 Jan 2013 04:30:51 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 21 Jan 2013 13:30:21 +0100 Message-Id: <1358771422-14282-12-git-send-email-pbonzini@redhat.com> In-Reply-To: <1358771422-14282-1-git-send-email-pbonzini@redhat.com> References: <1358771422-14282-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v2 11/12] cpu: do not use object_delete List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, afaerber@suse.de 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 --- linux-user/syscall.c | 2 +- target-i386/helper.c | 4 ++-- target-ppc/translate_init.c | 2 +- target-sparc/cpu.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 693e66f..a148d9f 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -5202,7 +5202,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, NULL, NULL, 0); } thread_env = NULL; - object_delete(OBJECT(ENV_GET_CPU(cpu_env))); + object_unref(OBJECT(ENV_GET_CPU(cpu_env))); g_free(ts); pthread_exit(NULL); } diff --git a/target-i386/helper.c b/target-i386/helper.c index 547c25e..269549d 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -1276,14 +1276,14 @@ X86CPU *cpu_x86_init(const char *cpu_model) env->cpu_model_str = cpu_model; if (cpu_x86_register(cpu, cpu_model) < 0) { - object_delete(OBJECT(cpu)); + object_unref(OBJECT(cpu)); return NULL; } x86_cpu_realize(OBJECT(cpu), &error); if (error) { error_free(error); - object_delete(OBJECT(cpu)); + object_unref(OBJECT(cpu)); return NULL; } return cpu; diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 2d78529..ee51419 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -10346,7 +10346,7 @@ PowerPCCPU *cpu_ppc_init(const char *cpu_model) if (err != NULL) { fprintf(stderr, "%s\n", error_get_pretty(err)); error_free(err); - object_delete(OBJECT(cpu)); + object_unref(OBJECT(cpu)); return NULL; } diff --git a/target-sparc/cpu.c b/target-sparc/cpu.c index f404aa8..4bc1afc 100644 --- a/target-sparc/cpu.c +++ b/target-sparc/cpu.c @@ -119,7 +119,7 @@ SPARCCPU *cpu_sparc_init(const char *cpu_model) } if (cpu_sparc_register(env, cpu_model) < 0) { - object_delete(OBJECT(cpu)); + object_unref(OBJECT(cpu)); return NULL; } qemu_init_vcpu(env); -- 1.8.1