On 11.03.2016 05:54, Bharata B Rao wrote: > cpu_exec_init() does vmstate_register for the CPU device. This needs to be > undone from cpu_exec_exit(). This change is needed to support CPU hot > removal. > > Signed-off-by: Bharata B Rao <bhar...@linux.vnet.ibm.com> > --- > exec.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/exec.c b/exec.c > index 49ae593..8ddca6b 100644 > --- a/exec.c > +++ b/exec.c > @@ -634,6 +634,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 > @@ -651,6 +653,13 @@ 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 (qdev_get_vmsd(DEVICE(cpu)) == NULL) { > + vmstate_unregister(NULL, &vmstate_cpu_common, cpu); > + } > } > > void cpu_exec_init(CPUState *cpu, Error **errp)
Reviewed-by: Thomas Huth <th...@redhat.com>