From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58523) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzQqz-000577-Mi for qemu-devel@nongnu.org; Thu, 19 Nov 2015 10:10:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZzQqt-00064N-8q for qemu-devel@nongnu.org; Thu, 19 Nov 2015 10:10:29 -0500 Received: from e39.co.us.ibm.com ([32.97.110.160]:56863) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzQqt-000646-1G for qemu-devel@nongnu.org; Thu, 19 Nov 2015 10:10:23 -0500 Received: from localhost by e39.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 19 Nov 2015 08:10:22 -0700 Received: from b03cxnp08026.gho.boulder.ibm.com (b03cxnp08026.gho.boulder.ibm.com [9.17.130.18]) by d03dlp01.boulder.ibm.com (Postfix) with ESMTP id 92ABA1FF002D for ; Thu, 19 Nov 2015 07:58:31 -0700 (MST) Received: from d03av05.boulder.ibm.com (d03av05.boulder.ibm.com [9.17.195.85]) by b03cxnp08026.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id tAJF96t919660852 for ; Thu, 19 Nov 2015 08:09:06 -0700 Received: from d03av05.boulder.ibm.com (localhost [127.0.0.1]) by d03av05.boulder.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id tAJFAJ9F017046 for ; Thu, 19 Nov 2015 08:10:19 -0700 From: Matthew Rosato Date: Thu, 19 Nov 2015 10:10:10 -0500 Message-Id: <1447945814-15765-6-git-send-email-mjrosato@linux.vnet.ibm.com> In-Reply-To: <1447945814-15765-1-git-send-email-mjrosato@linux.vnet.ibm.com> References: <1447945814-15765-1-git-send-email-mjrosato@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v2 5/9] s390x/cpu: Move some CPU initialization into realize List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: agraf@suse.de, borntraeger@de.ibm.com, cornelia.huck@de.ibm.com, pbonzini@redhat.com, afaerber@suse.de, rth@twiddle.net In preparation for hotplug, defer some CPU initialization until the device is actually being realized. Signed-off-by: Matthew Rosato --- target-s390x/cpu.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c index aafbbdc..bc821f7 100644 --- a/target-s390x/cpu.c +++ b/target-s390x/cpu.c @@ -36,6 +36,9 @@ #define CR0_RESET 0xE0UL #define CR14_RESET 0xC2000000UL; +/* Older kernels require CPUs to be added sequentially by id */ +static int next_cpu_id; + /* generate CPU information for cpu -? */ void s390_cpu_list(FILE *f, fprintf_function cpu_fprintf) { @@ -194,7 +197,13 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp) { CPUState *cs = CPU(dev); S390CPUClass *scc = S390_CPU_GET_CLASS(dev); + S390CPU *cpu = S390_CPU(dev); + CPUS390XState *env = &cpu->env; +#if !defined(CONFIG_USER_ONLY) + qemu_register_reset(s390_cpu_machine_reset_cb, cpu); +#endif + env->cpu_num = next_cpu_id++; s390_cpu_gdb_init(cs); qemu_init_vcpu(cs); #if !defined(CONFIG_USER_ONLY) @@ -212,7 +221,6 @@ static void s390_cpu_initfn(Object *obj) S390CPU *cpu = S390_CPU(obj); CPUS390XState *env = &cpu->env; static bool inited; - static int cpu_num = 0; #if !defined(CONFIG_USER_ONLY) struct tm tm; #endif @@ -222,7 +230,6 @@ static void s390_cpu_initfn(Object *obj) cs->exception_index = EXCP_HLT; cpu_exec_init(cs, &error_abort); #if !defined(CONFIG_USER_ONLY) - qemu_register_reset(s390_cpu_machine_reset_cb, cpu); qemu_get_timedate(&tm, 0); env->tod_offset = TOD_UNIX_EPOCH + (time2tod(mktimegm(&tm)) * 1000000000ULL); @@ -231,7 +238,6 @@ static void s390_cpu_initfn(Object *obj) env->cpu_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, s390x_cpu_timer, cpu); s390_cpu_set_state(CPU_STATE_STOPPED, cpu); #endif - env->cpu_num = cpu_num++; if (tcg_enabled() && !inited) { inited = true; -- 1.9.1