From patchwork Wed Oct 5 19:38:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 678580 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sq5vs4gDDz9s2Q for ; Thu, 6 Oct 2016 06:49:29 +1100 (AEDT) Received: from localhost ([::1]:51029 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brsBy-0001h9-JW for incoming@patchwork.ozlabs.org; Wed, 05 Oct 2016 15:49:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46355) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brs2E-0001Lz-1v for qemu-devel@nongnu.org; Wed, 05 Oct 2016 15:39:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1brs2B-0007af-Cd for qemu-devel@nongnu.org; Wed, 05 Oct 2016 15:39:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40024) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brs2B-0007aZ-6N for qemu-devel@nongnu.org; Wed, 05 Oct 2016 15:39:19 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9C679B042B; Wed, 5 Oct 2016 19:39:18 +0000 (UTC) Received: from thinkpad.redhat.com (ovpn-112-35.ams2.redhat.com [10.36.112.35]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u95Jcsef010540; Wed, 5 Oct 2016 15:39:14 -0400 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 5 Oct 2016 21:38:38 +0200 Message-Id: <1475696333-8706-5-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> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Wed, 05 Oct 2016 19:39:18 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 04/19] target-s390: move back cpu_exec_init() to init X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Matthew Rosato , Peter Maydell , Eduardo Habkost , Laurent Vivier , Markus Armbruster , Bharata B Rao , Paolo Bonzini , Richard Henderson , David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" We have now the cpu_exec_realize() in realize, so the init part must be in init. I've removed the cannot_destroy_with_object_finalize_yet field as it should be removed by commit c6644fc. (tested with QOM command provided by commit 4c315c27 with "z890.3-s390-cpu") CC: Richard Henderson Signed-off-by: Laurent Vivier --- target-s390x/cpu.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c index 20a88dd..74154a9 100644 --- a/target-s390x/cpu.c +++ b/target-s390x/cpu.c @@ -207,10 +207,6 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp) goto out; } - cpu_exec_init(cs, &err); - if (err != NULL) { - goto out; - } cpu_exec_realize(cs, &err); if (err != NULL) { goto out; @@ -293,6 +289,7 @@ static void s390_cpu_initfn(Object *obj) cs->env_ptr = env; cs->halted = 1; cs->exception_index = EXCP_HLT; + cpu_exec_init(cs, &error_abort); object_property_add(OBJECT(cpu), "id", "int64_t", s390x_cpu_get_id, s390x_cpu_set_id, NULL, NULL, NULL); s390_cpu_model_register_props(obj); @@ -444,12 +441,6 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data) cc->gdb_core_xml_file = "s390x-core64.xml"; cc->gdb_arch_name = s390_gdb_arch_name; - /* - * Reason: s390_cpu_realizefn() calls cpu_exec_init(), which saves - * the object in cpus -> dangling pointer after final - * object_unref(). - */ - dc->cannot_destroy_with_object_finalize_yet = true; s390_cpu_model_class_register_props(oc); }