ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Bharata B Rao 2016-05-12 09:18:12 +05:30 committed by David Gibson
parent 1c59eb39cf
commit 9dfeca7c6b
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
exec.c
View File

@ -57,6 +57,8 @@
#include "exec/ram_addr.h" #include "exec/ram_addr.h"
#include "exec/log.h" #include "exec/log.h"
#include "migration/vmstate.h"
#include "qemu/range.h" #include "qemu/range.h"
#ifndef _WIN32 #ifndef _WIN32
#include "qemu/mmap-alloc.h" #include "qemu/mmap-alloc.h"
@ -637,6 +639,8 @@ static void cpu_release_index(CPUState *cpu)
void cpu_exec_exit(CPUState *cpu) void cpu_exec_exit(CPUState *cpu)
{ {
CPUClass *cc = CPU_GET_CLASS(cpu);
#if defined(CONFIG_USER_ONLY) #if defined(CONFIG_USER_ONLY)
cpu_list_lock(); cpu_list_lock();
#endif #endif
@ -654,6 +658,13 @@ void cpu_exec_exit(CPUState *cpu)
#if defined(CONFIG_USER_ONLY) #if defined(CONFIG_USER_ONLY)
cpu_list_unlock(); cpu_list_unlock();
#endif #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) void cpu_exec_init(CPUState *cpu, Error **errp)