Re: [Qemu-devel] [PATCH] Fix vmstate_register_ram() for rom/device regions

[Andreas Färber]

Am 08.01.2012 13:31, schrieb Avi Kivity:
> rom/device regions have a ram_addr that is composed of both an I/O handler
> (low bits) and RAM region (high bits); but qemu_ram_set_idstr() excepts just

expects :) - if you can still change it on your branch.

Andreas

> a RAM region.  Mask the I/O handler to make it happy.
> 
> Signed-off-by: Avi Kivity <address@hidden>
> ---
>  savevm.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/savevm.c b/savevm.c
> index 88c4bd8..80be1ff 100644
> --- a/savevm.c
> +++ b/savevm.c
> @@ -2284,7 +2284,7 @@ void do_info_snapshots(Monitor *mon)
>  
>  void vmstate_register_ram(MemoryRegion *mr, DeviceState *dev)
>  {
> -    qemu_ram_set_idstr(memory_region_get_ram_addr(mr),
> +    qemu_ram_set_idstr(memory_region_get_ram_addr(mr) & TARGET_PAGE_MASK,
>                         memory_region_name(mr), dev);
>  }
>  

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg