On 12/05/2016 05:48, 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>
> Reviewed-by: Thomas Huth <th...@redhat.com>
> Reviewed-by: David Gibson <da...@gibson.dropbear.id.au>
> ---
> exec.c | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/exec.c b/exec.c
> index da1f09a..32bd5df 100644
> --- a/exec.c
> +++ b/exec.c
> @@ -635,6 +635,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
> @@ -652,6 +654,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)
>
Acked-by: Paolo Bonzini <pbonz...@redhat.com>
