From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42417) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1buipN-0004UU-77 for qemu-devel@nongnu.org; Thu, 13 Oct 2016 12:25:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1buipL-00089C-2N for qemu-devel@nongnu.org; Thu, 13 Oct 2016 12:25:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49062) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1buipK-00088x-ST for qemu-devel@nongnu.org; Thu, 13 Oct 2016 12:25:51 -0400 From: Laurent Vivier Date: Thu, 13 Oct 2016 18:24:54 +0200 Message-Id: <1476375902-11715-13-git-send-email-lvivier@redhat.com> In-Reply-To: <1476375902-11715-1-git-send-email-lvivier@redhat.com> References: <1476375902-11715-1-git-send-email-lvivier@redhat.com> Subject: [Qemu-devel] [PATCH v2 12/20] target-moxie: 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 , Peter Maydell , Eduardo Habkost , Bharata B Rao , Markus Armbruster , Matthew Rosato , Laurent Vivier , Anthony Green I've removed the cannot_destroy_with_object_finalize_yet field as unsafe references have been moved to cpu_exec_realize(). (tested with QOM command provided by commit 4c315c27 with "moxie-cpu") CC: Anthony Green Signed-off-by: Laurent Vivier --- target-moxie/cpu.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/target-moxie/cpu.c b/target-moxie/cpu.c index c9eed19..a4003aa 100644 --- a/target-moxie/cpu.c +++ b/target-moxie/cpu.c @@ -61,6 +61,13 @@ static void moxie_cpu_realizefn(DeviceState *dev, Error **errp) { CPUState *cs = CPU(dev); MoxieCPUClass *mcc = MOXIE_CPU_GET_CLASS(dev); + Error *local_err = NULL; + + cpu_exec_realize(cs, &local_err); + if (local_err != NULL) { + error_propagate(errp, local_err); + return; + } qemu_init_vcpu(cs); cpu_reset(cs); @@ -76,7 +83,6 @@ static void moxie_cpu_initfn(Object *obj) cs->env_ptr = &cpu->env; cpu_exec_init(cs); - cpu_exec_realize(cs, &error_abort); if (tcg_enabled() && !inited) { inited = 1; @@ -125,13 +131,6 @@ static void moxie_cpu_class_init(ObjectClass *oc, void *data) cc->vmsd = &vmstate_moxie_cpu; #endif cc->disas_set_info = moxie_cpu_disas_set_info; - - /* - * Reason: moxie_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 moxielite_initfn(Object *obj) -- 2.7.4