Re: [Qemu-devel] [PATCH 12/23] fixup: listener fixes

[Peter Maydell]

On 19 December 2011 14:13, Avi Kivity <address@hidden> wrote:
> ---

This is a rather uninformative commit message -- was this patch
intended to be in this series?

-- PMM

>  memory.c |    7 ++++---
>  1 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/memory.c b/memory.c
> index c08186d..2dcbf80 100644
> --- a/memory.c
> +++ b/memory.c
> @@ -708,13 +708,13 @@ static void memory_listener_update_region(FlatRange 
> *fr, AddressSpace *as,
>         .address_space = as->root,
>         .offset_within_region = fr->offset_in_region,
>         .size = int128_get64(fr->addr.size),
> -        .offset_within_region = int128_get64(fr->addr.start),
> +        .offset_within_address_space = int128_get64(fr->addr.start),
>     };
>     MemoryListener *listener;
>
>     QLIST_FOREACH(listener, &memory_listeners, link) {
>         ListenerCallback *callback
> -            = *(ListenerCallback *)((void *)listener + callback_offset);
> +            = *(ListenerCallback **)((void *)listener + callback_offset);
>         callback(listener, &section);
>     }
>  }
> @@ -1149,6 +1149,7 @@ void memory_region_sync_dirty_bitmap(MemoryRegion *mr)
>
>     FOR_EACH_FLAT_RANGE(fr, &address_space_memory.current_map) {
>         if (fr->mr == mr) {
> +            MEMORY_LISTENER_UPDATE_REGION(fr, &address_space_memory, 
> log_sync);
>             cpu_physical_sync_dirty_bitmap(int128_get64(fr->addr.start),
>                                            
> int128_get64(addrrange_end(fr->addr)));
>         }
> @@ -1467,7 +1468,7 @@ static void listener_add_address_space(MemoryListener 
> *listener,
>             .address_space = as->root,
>             .offset_within_region = fr->offset_in_region,
>             .size = int128_get64(fr->addr.size),
> -            .offset_within_region = int128_get64(fr->addr.start),
> +            .offset_within_address_space = int128_get64(fr->addr.start),
>         };
>         listener->region_add(listener, &section);
>     }
> --
> 1.7.7.1
>
>