[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] Re: [PATCH 05/18] vl.c: add deleted flag for deleting the h
From: |
Juan Quintela |
Subject: |
[Qemu-devel] Re: [PATCH 05/18] vl.c: add deleted flag for deleting the handler. |
Date: |
Wed, 23 Feb 2011 23:04:44 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) |
Yoshiaki Tamura <address@hidden> wrote:
> 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 <address@hidden>
> ---
> vl.c | 13 +++++++++----
> 1 files changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/vl.c b/vl.c
> index b436952..4e263c3 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -1158,6 +1158,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;
> };
>
> @@ -1178,8 +1179,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)
> @@ -1188,8 +1188,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);
this needs to become:
> + 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);
> + }
VMChangeState_entry *next;
QLIST_FOREACH_SAFE(e, &vm_change_state_head, entries, next) {
.....
Otherwise you are accessing "e" after qemu_free and being put out of
the list.
Later, Juan.
- [Qemu-devel] [PATCH 00/18] Kemari for KVM v0.2.11, Yoshiaki Tamura, 2011/02/23
- [Qemu-devel] [PATCH 03/18] Introduce skip_header parameter to qemu_loadvm_state()., Yoshiaki Tamura, 2011/02/23
- [Qemu-devel] [PATCH 10/18] Call init handler of event-tap at main() in vl.c., Yoshiaki Tamura, 2011/02/23
- [Qemu-devel] [PATCH 01/18] Make QEMUFile buf expandable, and introduce qemu_realloc_buffer() and qemu_clear_buffer()., Yoshiaki Tamura, 2011/02/23
- [Qemu-devel] [PATCH 12/18] Insert event_tap_mmio() to cpu_physical_memory_rw() in exec.c., Yoshiaki Tamura, 2011/02/23
- [Qemu-devel] [PATCH 18/18] Introduce "kemari:" to enable FT migration mode (Kemari)., Yoshiaki Tamura, 2011/02/23
- [Qemu-devel] [PATCH 06/18] virtio: decrement last_avail_idx with inuse before saving., Yoshiaki Tamura, 2011/02/23
- [Qemu-devel] [PATCH 05/18] vl.c: add deleted flag for deleting the handler., Yoshiaki Tamura, 2011/02/23
- [Qemu-devel] Re: [PATCH 05/18] vl.c: add deleted flag for deleting the handler.,
Juan Quintela <=
- [Qemu-devel] [PATCH 13/18] net: insert event-tap to qemu_send_packet() and qemu_sendv_packet_async()., Yoshiaki Tamura, 2011/02/23
- [Qemu-devel] [PATCH 08/18] savevm: introduce util functions to control ft_trans_file from savevm layer., Yoshiaki Tamura, 2011/02/23
- [Qemu-devel] [PATCH 09/18] Introduce event-tap., Yoshiaki Tamura, 2011/02/23
- [Qemu-devel] [PATCH 11/18] ioport: insert event_tap_ioport() to ioport_write()., Yoshiaki Tamura, 2011/02/23
- [Qemu-devel] [PATCH 14/18] block: insert event-tap to bdrv_aio_writev(), bdrv_aio_flush() and bdrv_flush()., Yoshiaki Tamura, 2011/02/23
- [Qemu-devel] [PATCH 07/18] Introduce fault tolerant VM transaction QEMUFile and ft_mode., Yoshiaki Tamura, 2011/02/23