From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42464) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZNDiI-0001ax-Os for qemu-devel@nongnu.org; Thu, 06 Aug 2015 01:27:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZNDiD-0007qb-Gn for qemu-devel@nongnu.org; Thu, 06 Aug 2015 01:27:34 -0400 Received: from e28smtp08.in.ibm.com ([122.248.162.8]:46171) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZNDiC-0007pL-T9 for qemu-devel@nongnu.org; Thu, 06 Aug 2015 01:27:29 -0400 Received: from /spool/local by e28smtp08.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 6 Aug 2015 10:57:25 +0530 From: Bharata B Rao Date: Thu, 6 Aug 2015 10:57:08 +0530 Message-Id: <1438838837-28504-3-git-send-email-bharata@linux.vnet.ibm.com> In-Reply-To: <1438838837-28504-1-git-send-email-bharata@linux.vnet.ibm.com> References: <1438838837-28504-1-git-send-email-bharata@linux.vnet.ibm.com> Subject: [Qemu-devel] [RFC PATCH v4 02/11] exec: Do vmstate unregistration from cpu_exec_exit() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aik@ozlabs.ru, Bharata B Rao , mdroth@linux.vnet.ibm.com, agraf@suse.de, qemu-ppc@nongnu.org, tyreld@linux.vnet.ibm.com, nfont@linux.vnet.ibm.com, imammedo@redhat.com, afaerber@suse.de, david@gibson.dropbear.id.au 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 --- exec.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/exec.c b/exec.c index b196d68..3415cd7 100644 --- a/exec.c +++ b/exec.c @@ -545,6 +545,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; @@ -556,6 +558,15 @@ void cpu_exec_exit(CPUState *cpu) } 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 @@ -572,12 +583,20 @@ 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->queued) { QTAILQ_REMOVE(&cpus, cpu, node); cpu->queued = false; } 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 -- 2.1.0