From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54848) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W3PYN-0006Ev-FC for qemu-devel@nongnu.org; Wed, 15 Jan 2014 07:26:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W3PY4-0005n3-T3 for qemu-devel@nongnu.org; Wed, 15 Jan 2014 07:26:39 -0500 Received: from [222.73.24.84] (port=14582 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W3PY4-0005ee-EH for qemu-devel@nongnu.org; Wed, 15 Jan 2014 07:26:20 -0500 Message-ID: <1389788641.2726.13.camel@G08FNSTD131468> From: Chen Fan Date: Wed, 15 Jan 2014 20:24:01 +0800 In-Reply-To: <20140114114003.6001b070@nial.usersys.redhat.com> References: <602453e20a4b721f596cd727b981e9e698c83159.1389685621.git.chen.fan.fnst@cn.fujitsu.com> <20140114114003.6001b070@nial.usersys.redhat.com> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="UTF-8" Subject: Re: [Qemu-devel] [RFC 1/3] target-i386: moving registers of vmstate from cpu_exec_init() to x86_cpu_realizefn() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Igor Mammedov Cc: qemu-devel@nongnu.org, Andreas =?ISO-8859-1?Q?F=E4rber?= On Tue, 2014-01-14 at 11:40 +0100, Igor Mammedov wrote: > On Tue, 14 Jan 2014 17:27:20 +0800 > Chen Fan wrote: > > > the intend of this patch is to register cpu vmstates with apic id instead of cpu > > index, due to the property setting of apic_id is behind the cpu initialization. so > > we move the registers of cpu vmstate from cpu_exec_init() to x86_cpu_realizefn() to > > let the set apicid as the parameter. > > > > Signed-off-by: Chen Fan > > --- > > exec.c | 5 +++++ > > target-i386/cpu.c | 9 +++++++++ > > 2 files changed, 14 insertions(+) > > > > diff --git a/exec.c b/exec.c > > index 7e49e8e..9be5855 100644 > > --- a/exec.c > > +++ b/exec.c > > @@ -438,7 +438,9 @@ CPUState *qemu_get_cpu(int index) > > void cpu_exec_init(CPUArchState *env) > > { > > CPUState *cpu = ENV_GET_CPU(env); > > +#if !defined(TARGET_I386) > > CPUClass *cc = CPU_GET_CLASS(cpu); > > +#endif > > CPUState *some_cpu; > > int cpu_index; > > > > @@ -460,6 +462,8 @@ void cpu_exec_init(CPUArchState *env) > > #if defined(CONFIG_USER_ONLY) > > cpu_list_unlock(); > > #endif > > + > > +#if !defined(TARGET_I386) > > if (qdev_get_vmsd(DEVICE(cpu)) == NULL) { > > vmstate_register(NULL, cpu_index, &vmstate_cpu_common, cpu); > > } > > @@ -472,6 +476,7 @@ void cpu_exec_init(CPUArchState *env) > > if (cc->vmsd != NULL) { > > vmstate_register(NULL, cpu_index, cc->vmsd, cpu); > > } > > +#endif /* !TARGET_I386 */ > > } > > > > #if defined(TARGET_HAS_ICE) > > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > > index 967529a..dada6f6 100644 > > --- a/target-i386/cpu.c > > +++ b/target-i386/cpu.c > > @@ -2552,6 +2552,7 @@ static void x86_cpu_apic_realize(X86CPU *cpu, Error **errp) > > static void x86_cpu_realizefn(DeviceState *dev, Error **errp) > > { > > CPUState *cs = CPU(dev); > > + CPUClass *cc = CPU_GET_CLASS(cs); > > X86CPU *cpu = X86_CPU(dev); > > X86CPUClass *xcc = X86_CPU_GET_CLASS(dev); > > CPUX86State *env = &cpu->env; > > @@ -2615,6 +2616,14 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) > > cpu_reset(cs); > > > > xcc->parent_realize(dev, &local_err); > > + > > + if (qdev_get_vmsd(DEVICE(cs)) == NULL) { > > + vmstate_register(NULL, env->cpuid_apic_id, &vmstate_cpu_common, cs); > > + } > > + > > + if (cc->vmsd != NULL) { > > + vmstate_register(NULL, env->cpuid_apic_id, cc->vmsd, cs); > > + } > how about doing it in common CPUclass.realize() > you can use get_arch_id() for getting CPU id, it returns cpu_index by default > and apic_id for target-i386. Thanks for your kind suggestion, does this mean we can directly move vmstate_register to cpu_common_realizefn()? > Pls note that changing vmstate id should be done only for new machine types > so not to break old qemu -> new qemu migration. Yes. Thanks. Chen > > > out: > > if (local_err != NULL) { > > error_propagate(errp, local_err); > >