diff options
| author | Bharata B Rao <bharata@linux.vnet.ibm.com> | 2016-05-12 09:18:12 +0530 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2016-05-30 14:03:29 +1000 |
| commit | 9dfeca7c6b1d3a8f36531bbbac0322a9907bcd86 (patch) | |
| tree | 0bfac7dc935693d7a68537c4fd55ba4e34ea9126 /exec.c | |
| parent | 1c59eb39cf75e660b1ac4ea95ef789c84021a1c4 (diff) | |
exec: Do vmstate unregistration from cpu_exec_exit()
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 <bharata@linux.vnet.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
[dwg: added missing include to fix compile on some archs]
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'exec.c')
| -rw-r--r-- | exec.c | 11 |
1 files changed, 11 insertions, 0 deletions
@@ -57,6 +57,8 @@ #include "exec/ram_addr.h" #include "exec/log.h" +#include "migration/vmstate.h" + #include "qemu/range.h" #ifndef _WIN32 #include "qemu/mmap-alloc.h" @@ -637,6 +639,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 @@ -654,6 +658,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) |