From patchwork Mon Jan 21 12:30:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 214150 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id F06D82C007B for ; Tue, 22 Jan 2013 00:32:15 +1100 (EST) Received: from localhost ([::1]:43466 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TxGXT-0006uB-J2 for incoming@patchwork.ozlabs.org; Mon, 21 Jan 2013 07:31:47 -0500 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=PqBluUbmx1woxv4EFIBUzy5uUbNHywq8umb3OSBHME4=; b=IDqjqA3gwcbYUxZ/9q72fQsKctT6vIxI6TDhPhExZgtS9yYLZxslSLW07Y/52tcUeu zj2+4Kt9MPYmhW/X6DkOASjIjSH8k0HwbKxzcb+FTPKSx72d2IMCRxOMSqZthKLu0TvU L8RvgXHR4admVwHrEaijHkTOX4AhkX8oJ0jUdecxpEzqkwXXlNnenfgUI7VkE7iBengF E1D+FPnD3nT0APPkSlmQdT2MKTjOXpyHzdMuwRrXJz7Hb4JrThovTDz4lrjViTIhQuob YJTxGC2pLKCUY+lMASFTGVQgebdmJ4MBn/Xg9zP2JAhL9EGTaXR5p1uqnoo5g4l05oU+ +bSA== X-Received: by 10.14.209.131 with SMTP id s3mr43032285eeo.26.1358771451184; Mon, 21 Jan 2013 04:30:51 -0800 (PST) Received: from yakj.lan (93-34-179-137.ip50.fastwebnet.it. [93.34.179.137]) by mx.google.com with ESMTPS id 46sm22102581eeg.4.2013.01.21.04.30.49 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 21 Jan 2013 04:30:50 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 21 Jan 2013 13:30:21 +0100 Message-Id: <1358771422-14282-12-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1 In-Reply-To: <1358771422-14282-1-git-send-email-pbonzini@redhat.com> References: <1358771422-14282-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 74.125.83.44 Cc: aliguori@us.ibm.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH v2 11/12] cpu: do not use object_delete X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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);