From patchwork Wed Jan 19 05:44:50 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [05/19] vl.c: add deleted flag for deleting the handler. Date: Tue, 18 Jan 2011 19:44:50 -0000 From: Yoshiaki Tamura X-Patchwork-Id: 79407 Message-Id: <1295415904-11918-6-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> 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); + } } }