From patchwork Thu Mar 5 15:38:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 446753 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 6261A1400A0 for ; Fri, 6 Mar 2015 02:42:34 +1100 (AEDT) Received: from localhost ([::1]:52565 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YTXuy-000388-DK for incoming@patchwork.ozlabs.org; Thu, 05 Mar 2015 10:42:32 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44819) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YTXs1-0005nO-KR for qemu-devel@nongnu.org; Thu, 05 Mar 2015 10:39:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YTXrw-0000Gw-U8 for qemu-devel@nongnu.org; Thu, 05 Mar 2015 10:39:29 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42890) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YTXrw-0000Go-C3 for qemu-devel@nongnu.org; Thu, 05 Mar 2015 10:39:24 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t25FdDXT000345 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 5 Mar 2015 10:39:13 -0500 Received: from localhost (ovpn-113-135.phx2.redhat.com [10.3.113.135]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t25FdBTF005120; Thu, 5 Mar 2015 10:39:12 -0500 From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Thu, 5 Mar 2015 12:38:50 -0300 Message-Id: <1425569930-6660-7-git-send-email-ehabkost@redhat.com> In-Reply-To: <1425569930-6660-1-git-send-email-ehabkost@redhat.com> References: <1425569930-6660-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: zhugh.fnst@cn.fujitsu.com, tangchen@cn.fujitsu.com, chen.fan.fnst@cn.fujitsu.com, isimatu.yasuaki@jp.fujitsu.com, Paolo Bonzini , Gu Zheng , Igor Mammedov , anshul.makkar@profitbricks.com, =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH 6/6] target-i386: Call cpu_exec_init() on realize 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 To allow new code to ask the CPU classes for CPU model information and allow QOM properties to be queried by qmp_device_list_properties(), we need to be able to safely instantiate a X86CPU object without any side-effects. cpu_exec_init() has lots of side-effects on global QEMU state, move it to realize so it will be called only if the X86CPU instance is realized. For reference, this is the current cpu_exec_init() code: > void cpu_exec_init(CPUArchState *env) > { > CPUState *cpu = ENV_GET_CPU(env); > CPUClass *cc = CPU_GET_CLASS(cpu); > CPUState *some_cpu; > int cpu_index; > > #ifndef CONFIG_USER_ONLY > cpu->as = &address_space_memory; > cpu->thread_id = qemu_get_thread_id(); > #endif Those fields should be used only after actually starting the VCPU and can be initialized on realize. > > #if defined(CONFIG_USER_ONLY) > cpu_list_lock(); > #endif > cpu_index = 0; > CPU_FOREACH(some_cpu) { > cpu_index++; > } > cpu->cpu_index = cpu_index; > QTAILQ_INSERT_TAIL(&cpus, cpu, node); > #if defined(CONFIG_USER_ONLY) > cpu_list_unlock(); > #endif The above initializes cpu_index and add the CPU to the global CPU list. This affects QEMU global state and must be done only on realize. > if (qdev_get_vmsd(DEVICE(cpu)) == NULL) { > vmstate_register(NULL, cpu_index, &vmstate_cpu_common, cpu); > } > #if defined(CPU_SAVE_VERSION) && !defined(CONFIG_USER_ONLY) > register_savevm(NULL, "cpu", cpu_index, CPU_SAVE_VERSION, > cpu_save, cpu_load, env); > assert(cc->vmsd == NULL); > assert(qdev_get_vmsd(DEVICE(cpu)) == NULL); > #endif > if (cc->vmsd != NULL) { > vmstate_register(NULL, cpu_index, cc->vmsd, cpu); > } vmstate and savevm registration also affects global QEMU state and should be done only on realize. > } Signed-off-by: Eduardo Habkost --- target-i386/cpu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 400b1e0..8b76604 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2758,6 +2758,8 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) static bool ht_warned; static bool tcg_initialized; + cpu_exec_init(env); + if (tcg_enabled() && !tcg_initialized) { tcg_initialized = 1; tcg_x86_init(); @@ -2840,7 +2842,6 @@ static void x86_cpu_initfn(Object *obj) CPUX86State *env = &cpu->env; cs->env_ptr = env; - cpu_exec_init(env); object_property_add(obj, "family", "int", x86_cpuid_version_get_family,