Re: [Qemu-devel] [PATCH 05/40] memory: do not duplicate memory_region_destructor_none

[Peter Maydell]

On 7 May 2013 15:16, Paolo Bonzini <address@hidden> wrote:
> Signed-off-by: Paolo Bonzini <address@hidden>
> ---
>  memory.c |    6 +-----
>  1 files changed, 1 insertions(+), 5 deletions(-)
>
> diff --git a/memory.c b/memory.c
> index 013464b..a6e9bc5 100644
> --- a/memory.c
> +++ b/memory.c
> @@ -768,10 +768,6 @@ static void 
> memory_region_destructor_ram_from_ptr(MemoryRegion *mr)
>      qemu_ram_free_from_ptr(mr->ram_addr);
>  }
>
> -static void memory_region_destructor_iomem(MemoryRegion *mr)
> -{
> -}
> -
>  static void memory_region_destructor_rom_device(MemoryRegion *mr)
>  {
>      qemu_ram_free(mr->ram_addr & TARGET_PAGE_MASK);
> @@ -929,7 +925,7 @@ void memory_region_init_io(MemoryRegion *mr,
>      mr->ops = ops;
>      mr->opaque = opaque;
>      mr->terminates = true;
> -    mr->destructor = memory_region_destructor_iomem;
> +    mr->destructor = memory_region_destructor_none;
>      mr->ram_addr = ~(ram_addr_t)0;

We've just called memory_region_init() which sets the
destructor to the 'none' function, so you don't need
to re-set it again here.

-- PMM