From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yoshiaki Tamura Subject: [PATCH 05/19] vl.c: add deleted flag for deleting the handler. Date: Fri, 28 Jan 2011 16:21:38 +0900 Message-ID: <1296199312-26334-6-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> References: <1296199312-26334-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> Cc: avi@redhat.com, anthony@codemonkey.ws, aliguori@us.ibm.com, mtosatti@redhat.com, dlaor@redhat.com, mst@redhat.com, kwolf@redhat.com, ananth@in.ibm.com, psuriset@linux.vnet.ibm.com, vatsa@linux.vnet.ibm.com, stefanha@linux.vnet.ibm.com, blauwirbel@gmail.com, ohmura.kei@lab.ntt.co.jp, Yoshiaki Tamura To: kvm@vger.kernel.org, qemu-devel@nongnu.org Return-path: Received: from sh.osrg.net ([192.16.179.4]:58921 "EHLO sh.osrg.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753203Ab1A1HXp (ORCPT ); Fri, 28 Jan 2011 02:23:45 -0500 In-Reply-To: <1296199312-26334-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> Sender: kvm-owner@vger.kernel.org List-ID: Make deleting handlers robust against deletion of any elements in a handler by using a deleted flag like in file descriptors. Signed-off-by: Yoshiaki Tamura --- vl.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/vl.c b/vl.c index 0292184..8bbb785 100644 --- a/vl.c +++ b/vl.c @@ -1140,6 +1140,7 @@ static void nographic_update(void *opaque) struct vm_change_state_entry { VMChangeStateHandler *cb; void *opaque; + int deleted; QLIST_ENTRY (vm_change_state_entry) entries; }; @@ -1160,8 +1161,7 @@ VMChangeStateEntry *qemu_add_vm_change_state_handler(VMChangeStateHandler *cb, void qemu_del_vm_change_state_handler(VMChangeStateEntry *e) { - QLIST_REMOVE (e, entries); - qemu_free (e); + e->deleted = 1; } void vm_state_notify(int running, int reason) @@ -1170,8 +1170,13 @@ void vm_state_notify(int running, int reason) trace_vm_state_notify(running, reason); - for (e = vm_change_state_head.lh_first; e; e = e->entries.le_next) { - e->cb(e->opaque, running, reason); + QLIST_FOREACH(e, &vm_change_state_head, entries) { + if (e->deleted) { + QLIST_REMOVE(e, entries); + qemu_free(e); + } else { + e->cb(e->opaque, running, reason); + } } } -- 1.7.1.2 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=48331 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Piig9-0000s7-Hc for qemu-devel@nongnu.org; Fri, 28 Jan 2011 02:23:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Piig6-00078u-IX for qemu-devel@nongnu.org; Fri, 28 Jan 2011 02:23:33 -0500 Received: from sh.osrg.net ([192.16.179.4]:58324) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Piig6-00072f-0Z for qemu-devel@nongnu.org; Fri, 28 Jan 2011 02:23:30 -0500 From: Yoshiaki Tamura Date: Fri, 28 Jan 2011 16:21:38 +0900 Message-Id: <1296199312-26334-6-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> In-Reply-To: <1296199312-26334-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> References: <1296199312-26334-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> Subject: [Qemu-devel] [PATCH 05/19] vl.c: add deleted flag for deleting the handler. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: kvm@vger.kernel.org, qemu-devel@nongnu.org Cc: kwolf@redhat.com, aliguori@us.ibm.com, mtosatti@redhat.com, ananth@in.ibm.com, mst@redhat.com, dlaor@redhat.com, vatsa@linux.vnet.ibm.com, Yoshiaki Tamura , blauwirbel@gmail.com, ohmura.kei@lab.ntt.co.jp, avi@redhat.com, psuriset@linux.vnet.ibm.com, stefanha@linux.vnet.ibm.com Make deleting handlers robust against deletion of any elements in a handler by using a deleted flag like in file descriptors. Signed-off-by: Yoshiaki Tamura --- vl.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/vl.c b/vl.c index 0292184..8bbb785 100644 --- a/vl.c +++ b/vl.c @@ -1140,6 +1140,7 @@ static void nographic_update(void *opaque) struct vm_change_state_entry { VMChangeStateHandler *cb; void *opaque; + int deleted; QLIST_ENTRY (vm_change_state_entry) entries; }; @@ -1160,8 +1161,7 @@ VMChangeStateEntry *qemu_add_vm_change_state_handler(VMChangeStateHandler *cb, void qemu_del_vm_change_state_handler(VMChangeStateEntry *e) { - QLIST_REMOVE (e, entries); - qemu_free (e); + e->deleted = 1; } void vm_state_notify(int running, int reason) @@ -1170,8 +1170,13 @@ void vm_state_notify(int running, int reason) trace_vm_state_notify(running, reason); - for (e = vm_change_state_head.lh_first; e; e = e->entries.le_next) { - e->cb(e->opaque, running, reason); + QLIST_FOREACH(e, &vm_change_state_head, entries) { + if (e->deleted) { + QLIST_REMOVE(e, entries); + qemu_free(e); + } else { + e->cb(e->opaque, running, reason); + } } } -- 1.7.1.2