From patchwork Wed Jan 27 16:53:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Rosato X-Patchwork-Id: 8135821 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id DF65ABEEED for ; Wed, 27 Jan 2016 16:54:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2DAB0201FA for ; Wed, 27 Jan 2016 16:54:11 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9C181202EB for ; Wed, 27 Jan 2016 16:54:09 +0000 (UTC) Received: from localhost ([::1]:51391 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOTM8-0006s1-J3 for patchwork-qemu-devel@patchwork.kernel.org; Wed, 27 Jan 2016 11:54:08 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60359) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOTLr-0006me-Nx for qemu-devel@nongnu.org; Wed, 27 Jan 2016 11:53:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aOTLn-0003gI-FF for qemu-devel@nongnu.org; Wed, 27 Jan 2016 11:53:51 -0500 Received: from e31.co.us.ibm.com ([32.97.110.149]:44994) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOTLn-0003g6-8o for qemu-devel@nongnu.org; Wed, 27 Jan 2016 11:53:47 -0500 Received: from localhost by e31.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 27 Jan 2016 09:53:46 -0700 Received: from d03dlp02.boulder.ibm.com (9.17.202.178) by e31.co.us.ibm.com (192.168.1.131) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 27 Jan 2016 09:53:44 -0700 X-IBM-Helo: d03dlp02.boulder.ibm.com X-IBM-MailFrom: mjrosato@linux.vnet.ibm.com X-IBM-RcptTo: qemu-devel@nongnu.org Received: from b01cxnp22033.gho.pok.ibm.com (b01cxnp22033.gho.pok.ibm.com [9.57.198.23]) by d03dlp02.boulder.ibm.com (Postfix) with ESMTP id BB5923E4004E for ; Wed, 27 Jan 2016 09:53:43 -0700 (MST) Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by b01cxnp22033.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u0RGrh0F20578376 for ; Wed, 27 Jan 2016 16:53:43 GMT Received: from d01av01.pok.ibm.com (localhost [127.0.0.1]) by d01av01.pok.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u0RGrgBj003094 for ; Wed, 27 Jan 2016 11:53:43 -0500 Received: from rosatomj-ThinkPad-W530.endicott.ibm.com (rosatomj-thinkpad-w530.endicott.ibm.com [9.60.85.43]) by d01av01.pok.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id u0RGrfoc002899; Wed, 27 Jan 2016 11:53:41 -0500 From: Matthew Rosato To: qemu-devel@nongnu.org Date: Wed, 27 Jan 2016 11:53:33 -0500 Message-Id: <1453913621-20961-3-git-send-email-mjrosato@linux.vnet.ibm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1453913621-20961-1-git-send-email-mjrosato@linux.vnet.ibm.com> References: <1453913621-20961-1-git-send-email-mjrosato@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16012716-8236-0000-0000-000015906F35 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 32.97.110.149 Cc: agraf@suse.de, borntraeger@de.ibm.com, bharata@linux.vnet.ibm.com, cornelia.huck@de.ibm.com, pbonzini@redhat.com, afaerber@suse.de, rth@twiddle.net Subject: [Qemu-devel] [PATCH v3 02/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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bharata B Rao 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 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