From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60350) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOTLq-0006mb-Pn for qemu-devel@nongnu.org; Wed, 27 Jan 2016 11:53:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aOTLm-0003fw-Li for qemu-devel@nongnu.org; Wed, 27 Jan 2016 11:53:50 -0500 Received: from e17.ny.us.ibm.com ([129.33.205.207]:41479) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOTLm-0003ff-HW for qemu-devel@nongnu.org; Wed, 27 Jan 2016 11:53:46 -0500 Received: from localhost by e17.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 27 Jan 2016 11:53:45 -0500 Received: from b01cxnp23034.gho.pok.ibm.com (b01cxnp23034.gho.pok.ibm.com [9.57.198.29]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id 17B396E8041 for ; Wed, 27 Jan 2016 11:40:35 -0500 (EST) Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by b01cxnp23034.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u0RGrg0w33423464 for ; Wed, 27 Jan 2016 16:53:42 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 u0RGrfWP003008 for ; Wed, 27 Jan 2016 11:53:41 -0500 From: Matthew Rosato Date: Wed, 27 Jan 2016 11:53:32 -0500 Message-Id: <1453913621-20961-2-git-send-email-mjrosato@linux.vnet.ibm.com> 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> Subject: [Qemu-devel] [PATCH v3 01/10] exec: Remove cpu from cpus list during cpu_exec_exit() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 From: Bharata B Rao CPUState *cpu gets added to the cpus list during cpu_exec_init(). It should be removed from cpu_exec_exit(). cpu_exec_init() is called from generic CPU::instance_finalize and some archs like PowerPC call it from CPU unrealizefn. So ensure that we dequeue the cpu only once. Now -1 value for cpu->cpu_index indicates that we have already dequeued the cpu for CONFIG_USER_ONLY case also. Signed-off-by: Bharata B Rao Reviewed-by: David Gibson --- exec.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/exec.c b/exec.c index 7115403..c8da9d4 100644 --- a/exec.c +++ b/exec.c @@ -596,6 +596,7 @@ void cpu_exec_exit(CPUState *cpu) return; } + QTAILQ_REMOVE(&cpus, cpu, node); bitmap_clear(cpu_index_map, cpu->cpu_index, 1); cpu->cpu_index = -1; } @@ -614,6 +615,15 @@ static int cpu_get_free_index(Error **errp) void cpu_exec_exit(CPUState *cpu) { + cpu_list_lock(); + if (cpu->cpu_index == -1) { + cpu_list_unlock(); + return; + } + + QTAILQ_REMOVE(&cpus, cpu, node); + cpu->cpu_index = -1; + cpu_list_unlock(); } #endif -- 1.9.1