On Mon, Mar 07, 2016 at 01:51:43PM +1100, David Gibson wrote:
> On Fri, Mar 04, 2016 at 12:24:13PM +0530, Bharata B Rao wrote:
> > cpu_exec_init() does vmstate_register and register_savevm for the CPU
> > device.
> > These need to be undone from cpu_exec_exit(). These changes are needed to
> > support CPU hot removal.
> >
> > Signed-off-by: Bharata B Rao <bhar...@linux.vnet.ibm.com>
> > ---
> > exec.c | 12 ++++++++++++
> > 1 file changed, 12 insertions(+)
> >
> > diff --git a/exec.c b/exec.c
> > index 7c3f747..b8eeb54 100644
> > --- a/exec.c
> > +++ b/exec.c
> > @@ -613,6 +613,8 @@ static void cpu_release_index(CPUState *cpu)
> >
> > void cpu_exec_exit(CPUState *cpu)
> > {
> > + CPUClass *cc = CPU_GET_CLASS(cpu);
> > +
> > #if defined(CONFIG_USER_ONLY)
> > cpu_list_lock();
> > #endif
> > @@ -630,6 +632,16 @@ void cpu_exec_exit(CPUState *cpu)
> > #if defined(CONFIG_USER_ONLY)
> > cpu_list_unlock();
> > #endif
> > +
> > + if (cc->vmsd != NULL) {
> > + vmstate_unregister(NULL, cc->vmsd, cpu);
> > + }
> > +#if defined(CPU_SAVE_VERSION) && !defined(CONFIG_USER_ONLY)
> > + unregister_savevm(NULL, "cpu", cpu->env_ptr);
> > +#endif
> > + if (qdev_get_vmsd(DEVICE(cpu)) == NULL) {
> > + vmstate_unregister(NULL, &vmstate_cpu_common, cpu);
> > + }
> > }
> >
> > void cpu_exec_init(CPUState *cpu, Error **errp)
>
> Looking at the current cpu_exec_init() I'm seeing the
> vmstate_register() calls which are balacned here, but not a
> register_savevm(). Is that due to a change in cpu_exec_init() since
> you first wrote this patch?
Yes register_savevm() was removed by 945123a554c3. Will fix this patch
in the next iteration.
Regards,
Bharata.
