From patchwork Fri Nov 20 12:54:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bharata B Rao X-Patchwork-Id: 546908 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 123D114076E for ; Fri, 20 Nov 2015 23:58:19 +1100 (AEDT) Received: from localhost ([::1]:46969 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzlGa-000625-MS for incoming@patchwork.ozlabs.org; Fri, 20 Nov 2015 07:58:16 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57661) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzlDp-0000y2-OM for qemu-devel@nongnu.org; Fri, 20 Nov 2015 07:55:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZzlDn-0000CM-O0 for qemu-devel@nongnu.org; Fri, 20 Nov 2015 07:55:25 -0500 Received: from e28smtp05.in.ibm.com ([122.248.162.5]:39608) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzlDn-0000Bn-0B for qemu-devel@nongnu.org; Fri, 20 Nov 2015 07:55:23 -0500 Received: from /spool/local by e28smtp05.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 20 Nov 2015 18:25:20 +0530 Received: from d28dlp02.in.ibm.com (9.184.220.127) by e28smtp05.in.ibm.com (192.168.1.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 20 Nov 2015 18:25:19 +0530 X-Helo: d28dlp02.in.ibm.com X-MailFrom: bharata@linux.vnet.ibm.com X-RcptTo: qemu-ppc@nongnu.org Received: from d28relay04.in.ibm.com (d28relay04.in.ibm.com [9.184.220.61]) by d28dlp02.in.ibm.com (Postfix) with ESMTP id 86E8B3940065; Fri, 20 Nov 2015 18:25:18 +0530 (IST) Received: from d28av03.in.ibm.com (d28av03.in.ibm.com [9.184.220.65]) by d28relay04.in.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id tAKCsu8M58458140; Fri, 20 Nov 2015 18:24:58 +0530 Received: from d28av03.in.ibm.com (localhost [127.0.0.1]) by d28av03.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id tAKCsuBv021788; Fri, 20 Nov 2015 18:24:56 +0530 Received: from bharata.in.ibm.com ([9.79.193.217]) by d28av03.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id tAKCsn1n021357; Fri, 20 Nov 2015 18:24:54 +0530 From: Bharata B Rao To: qemu-devel@nongnu.org Date: Fri, 20 Nov 2015 18:24:32 +0530 Message-Id: <1448024079-20808-4-git-send-email-bharata@linux.vnet.ibm.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1448024079-20808-1-git-send-email-bharata@linux.vnet.ibm.com> References: <1448024079-20808-1-git-send-email-bharata@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15112012-0017-0000-0000-00000880B488 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 122.248.162.5 Cc: aik@ozlabs.ru, Bharata B Rao , mdroth@linux.vnet.ibm.com, agraf@suse.de, pbonzini@redhat.com, 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 Subject: [Qemu-devel] [PATCH v5 03/10] exec: Do vmstate unregistration from cpu_exec_exit() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 Reviewed-by: David Gibson --- 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