From patchwork Fri Jan 25 13:12:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 215735 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 1F1BA2C008E for ; Sat, 26 Jan 2013 01:05:51 +1100 (EST) Received: from localhost ([::1]:41915 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tyj6V-0008UQ-0S for incoming@patchwork.ozlabs.org; Fri, 25 Jan 2013 08:13:59 -0500 Received: from eggs.gnu.org ([208.118.235.92]:49241) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tyj5p-0007b2-Ev for qemu-devel@nongnu.org; Fri, 25 Jan 2013 08:13:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tyj5i-0002DG-Uz for qemu-devel@nongnu.org; Fri, 25 Jan 2013 08:13:15 -0500 Received: from mail-qc0-f178.google.com ([209.85.216.178]:51993) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tyj5i-0002Cz-Px for qemu-devel@nongnu.org; Fri, 25 Jan 2013 08:13:10 -0500 Received: by mail-qc0-f178.google.com with SMTP id j34so159667qco.37 for ; Fri, 25 Jan 2013 05:13:10 -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=FPQJKBMh0LDdx83nwhanAAgy4C9UNc4N6WPZKiLfm9FhiYFUDK8B7P7wPr4zcAwDbM pl3cDYNwW7fD1X6jefTBPEtt9aIrYgP1GiMCg7zq+vstvFZLyTxvXKhpnteBoTUUwXSD IUWBvUPdmSBem4t5sKGSUtT4lAiBYv3fuk/S0egQjtsXtXWvhdmls7l0sGAkp0a4hkBZ WQgoVXGikb04BNNn4O20ZSUEFawhv436s829hk1gymZE2uf03HuP4pjPi20zwZsX7Jqh vtozGXZ668K2r4WHjAxIt4aZin391lVH+5Vn4D5vIiwGSOo7AdjyftCAi7ByDjz5b9NZ ND3A== X-Received: by 10.229.196.25 with SMTP id ee25mr1321826qcb.17.1359119590430; Fri, 25 Jan 2013 05:13:10 -0800 (PST) Received: from yakj.usersys.redhat.com (93-34-179-137.ip50.fastwebnet.it. [93.34.179.137]) by mx.google.com with ESMTPS id u8sm416277qeu.2.2013.01.25.05.13.08 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 25 Jan 2013 05:13:09 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2013 14:12:38 +0100 Message-Id: <1359119559-19075-13-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1 In-Reply-To: <1359119559-19075-1-git-send-email-pbonzini@redhat.com> References: <1359119559-19075-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.216.178 Cc: afaerber@suse.de Subject: [Qemu-devel] [PATCH v4 12/13] 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);