From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46477) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brs2b-0001hI-OU for qemu-devel@nongnu.org; Wed, 05 Oct 2016 15:39:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1brs2a-0007lP-Hm for qemu-devel@nongnu.org; Wed, 05 Oct 2016 15:39:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40188) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brs2a-0007lF-BT for qemu-devel@nongnu.org; Wed, 05 Oct 2016 15:39:44 -0400 From: Laurent Vivier Date: Wed, 5 Oct 2016 21:38:43 +0200 Message-Id: <1475696333-8706-10-git-send-email-lvivier@redhat.com> In-Reply-To: <1475696333-8706-1-git-send-email-lvivier@redhat.com> References: <1475696333-8706-1-git-send-email-lvivier@redhat.com> Subject: [Qemu-devel] [PATCH 09/19] target-m68k: move cpu_exec_realize() to realize function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: David Gibson , Paolo Bonzini , Markus Armbruster , Eduardo Habkost , Bharata B Rao , Peter Maydell , Matthew Rosato , Laurent Vivier , Greg Ungerer I've removed the cannot_destroy_with_object_finalize_yet field as cpu_exec_init() is not called by m68k_cpu_initfn() anymore (tested with QOM command provided by commit 4c315c27 with "any-m68k-cpu") CC: Greg Ungerer Signed-off-by: Laurent Vivier --- target-m68k/cpu.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/target-m68k/cpu.c b/target-m68k/cpu.c index 307910a..0728e02 100644 --- a/target-m68k/cpu.c +++ b/target-m68k/cpu.c @@ -159,6 +159,13 @@ static void m68k_cpu_realizefn(DeviceState *dev, Error **errp) CPUState *cs = CPU(dev); M68kCPU *cpu = M68K_CPU(dev); M68kCPUClass *mcc = M68K_CPU_GET_CLASS(dev); + Error *local_err = NULL; + + cpu_exec_realize(cs, &local_err); + if (local_err != NULL) { + error_propagate(errp, local_err); + return; + } m68k_cpu_init_gdb(cpu); @@ -177,7 +184,6 @@ static void m68k_cpu_initfn(Object *obj) cs->env_ptr = env; cpu_exec_init(cs, &error_abort); - cpu_exec_realize(cs, &error_abort); if (tcg_enabled() && !inited) { inited = true; @@ -223,13 +229,6 @@ static void m68k_cpu_class_init(ObjectClass *c, void *data) cc->gdb_core_xml_file = "cf-core.xml"; dc->vmsd = &vmstate_m68k_cpu; - - /* - * Reason: m68k_cpu_initfn() calls cpu_exec_init(), which saves - * the object in cpus -> dangling pointer after final - * object_unref(). - */ - dc->cannot_destroy_with_object_finalize_yet = true; } static void register_cpu_type(const M68kCPUInfo *info) -- 2.7.4