From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57448) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzlDa-0000SF-01 for qemu-devel@nongnu.org; Fri, 20 Nov 2015 07:55:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZzlDY-00006w-11 for qemu-devel@nongnu.org; Fri, 20 Nov 2015 07:55:09 -0500 Received: from e28smtp04.in.ibm.com ([122.248.162.4]:41723) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzlDX-0008WQ-7z for qemu-devel@nongnu.org; Fri, 20 Nov 2015 07:55:07 -0500 Received: from /spool/local by e28smtp04.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 20 Nov 2015 18:25:01 +0530 From: Bharata B Rao Date: Fri, 20 Nov 2015 18:24:31 +0530 Message-Id: <1448024079-20808-3-git-send-email-bharata@linux.vnet.ibm.com> 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> Subject: [Qemu-devel] [PATCH v5 02/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: 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 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 --- exec.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/exec.c b/exec.c index b09f18b..fbac85b 100644 --- a/exec.c +++ b/exec.c @@ -593,6 +593,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; } @@ -611,6 +612,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 -- 2.1.0