[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 02/10] exec: Do vmstate unregistration from cpu_e
From: |
Matthew Rosato |
Subject: |
[Qemu-devel] [PATCH v3 02/10] exec: Do vmstate unregistration from cpu_exec_exit() |
Date: |
Wed, 27 Jan 2016 11:53:33 -0500 |
From: Bharata B Rao <address@hidden>
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 <address@hidden>
Reviewed-by: David Gibson <address@hidden>
---
exec.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/exec.c b/exec.c
index c8da9d4..aa41032 100644
--- a/exec.c
+++ b/exec.c
@@ -591,6 +591,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;
@@ -599,6 +601,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
@@ -615,6 +626,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();
@@ -624,6 +637,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
--
1.9.1
- [Qemu-devel] [PATCH v3 00/10] Allow hotplug of s390 CPUs, Matthew Rosato, 2016/01/27
- [Qemu-devel] [PATCH v3 01/10] exec: Remove cpu from cpus list during cpu_exec_exit(), Matthew Rosato, 2016/01/27
- [Qemu-devel] [PATCH v3 10/10] s390x/cpu: Allow hot plug/unplug of CPUs, Matthew Rosato, 2016/01/27
- [Qemu-devel] [PATCH v3 02/10] exec: Do vmstate unregistration from cpu_exec_exit(),
Matthew Rosato <=
- [Qemu-devel] [PATCH v3 05/10] s390x/cpu: Cleanup init in preparation for hotplug, Matthew Rosato, 2016/01/27
- [Qemu-devel] [PATCH v3 08/10] s390x/cpu: Add functions to (un)register CPU state, Matthew Rosato, 2016/01/27
- [Qemu-devel] [PATCH v3 07/10] s390x/cpu: Move some CPU initialization into realize, Matthew Rosato, 2016/01/27
- [Qemu-devel] [PATCH v3 09/10] s390/virtio-ccw: Add hotplug handler and prepare for unplug, Matthew Rosato, 2016/01/27
- [Qemu-devel] [PATCH v3 03/10] cpu: Reclaim vCPU objects, Matthew Rosato, 2016/01/27
- [Qemu-devel] [PATCH v3 04/10] cpu: Add a sync version of cpu_remove(), Matthew Rosato, 2016/01/27
- [Qemu-devel] [PATCH v3 06/10] s390x/cpu: Set initial CPU state in common routine, Matthew Rosato, 2016/01/27