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

[Peter Maydell <peter.maydell@xxxxxxxxxx>]

On 19 December 2011 14:13, Avi Kivity <avi@xxxxxxxxxx> 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
>
>

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel