On Fri, Nov 20, 2015 at 06:24:32PM +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 and also to correctly fail hotplug attempts > beyond max_cpus. > > Signed-off-by: Bharata B Rao <bhar...@linux.vnet.ibm.com>
Reviewed-by: David Gibson <da...@gibson.dropbear.id.au>
> ---
> exec.c | 20 ++++++++++++++++++++
> 1 file changed, 20 insertions(+)
>
> diff --git a/exec.c b/exec.c
> index fbac85b..47f03c0 100644
> --- a/exec.c
> +++ b/exec.c
> @@ -588,6 +588,8 @@ static int cpu_get_free_index(Error **errp)
>
> void cpu_exec_exit(CPUState *cpu)
> {
> + CPUClass *cc = CPU_GET_CLASS(cpu);
> +
> if (cpu->cpu_index == -1) {
> /* cpu_index was never allocated by this @cpu or was already freed.
> */
> return;
> @@ -596,6 +598,15 @@ void cpu_exec_exit(CPUState *cpu)
> QTAILQ_REMOVE(&cpus, cpu, node);
> bitmap_clear(cpu_index_map, cpu->cpu_index, 1);
> cpu->cpu_index = -1;
> + if (cc->vmsd != NULL) {
> + vmstate_unregister(NULL, cc->vmsd, cpu);
> + }
> +#if defined(CPU_SAVE_VERSION)
> + unregister_savevm(NULL, "cpu", cpu->env_ptr);
> +#endif
> + if (qdev_get_vmsd(DEVICE(cpu)) == NULL) {
> + vmstate_unregister(NULL, &vmstate_cpu_common, cpu);
> + }
> }
> #else
>
> @@ -612,6 +623,8 @@ static int cpu_get_free_index(Error **errp)
>
> void cpu_exec_exit(CPUState *cpu)
> {
> + CPUClass *cc = CPU_GET_CLASS(cpu);
> +
> cpu_list_lock();
> if (cpu->cpu_index == -1) {
> cpu_list_unlock();
> @@ -621,6 +634,13 @@ void cpu_exec_exit(CPUState *cpu)
> QTAILQ_REMOVE(&cpus, cpu, node);
> cpu->cpu_index = -1;
> cpu_list_unlock();
> +
> + if (cc->vmsd != NULL) {
> + vmstate_unregister(NULL, cc->vmsd, cpu);
> + }
> + if (qdev_get_vmsd(DEVICE(cpu)) == NULL) {
> + vmstate_unregister(NULL, &vmstate_cpu_common, cpu);
> + }
> }
> #endif
>
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
