From patchwork Wed Oct 5 19:38:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 678572 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 3sq5jg1LN8z9ryn for ; Thu, 6 Oct 2016 06:40:39 +1100 (AEDT) Received: from localhost ([::1]:50989 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brs3Q-0002Qa-0l for incoming@patchwork.ozlabs.org; Wed, 05 Oct 2016 15:40:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46310) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brs25-0001Dr-MX for qemu-devel@nongnu.org; Wed, 05 Oct 2016 15:39:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1brs21-0007We-D6 for qemu-devel@nongnu.org; Wed, 05 Oct 2016 15:39:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39926) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brs21-0007WW-6J for qemu-devel@nongnu.org; Wed, 05 Oct 2016 15:39:09 -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 8481EAEF2D; Wed, 5 Oct 2016 19:39:08 +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 u95Jcsed010540; Wed, 5 Oct 2016 15:39:04 -0400 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 5 Oct 2016 21:38:36 +0200 Message-Id: <1475696333-8706-3-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:08 +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 02/19] target-i386: 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 , 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 cpu_exec_init() is not called by x86_cpu_initfn() anymore (tested with QOM command provided by commit 4c315c27 with "athlon-x86_64-cpu") CC: Eduardo Habkost Signed-off-by: Laurent Vivier --- target-i386/cpu.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 125a10c..087c78d 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -3158,8 +3158,11 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) cpu->phys_bits = 32; } } - cpu_exec_init(cs, &error_abort); - cpu_exec_realize(cs, &error_abort); + cpu_exec_realize(cs, &local_err); + if (local_err != NULL) { + error_propagate(errp, local_err); + return; + } if (tcg_enabled()) { tcg_x86_init(); @@ -3365,6 +3368,7 @@ static void x86_cpu_initfn(Object *obj) FeatureWord w; cs->env_ptr = env; + cpu_exec_init(cs, &error_abort); object_property_add(obj, "family", "int", x86_cpuid_version_get_family, @@ -3538,11 +3542,6 @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data) cc->cpu_exec_exit = x86_cpu_exec_exit; dc->cannot_instantiate_with_device_add_yet = false; - /* - * Reason: x86_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 const TypeInfo x86_cpu_type_info = {