Re: [Qemu-devel] [PATCH] memory: remove memory_region_destructor_rom_device

[Fam Zheng <famz@redhat.com>]

On Wed, 09/14 11:06, Paolo Bonzini wrote:
> It is equivalent to memory_region_destructor_ram, use that one.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  memory.c | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/memory.c b/memory.c
> index 0eb6895..5ed3872 100644
> --- a/memory.c
> +++ b/memory.c
> @@ -943,10 +943,6 @@ static void memory_region_destructor_ram(MemoryRegion *mr)
>  {
>      qemu_ram_free(mr->ram_block);
>  }
> -
> -static void memory_region_destructor_rom_device(MemoryRegion *mr)
> -{
> -    qemu_ram_free(mr->ram_block);
>  }

You want to remove the closing brace line too.

Fam

>  
>  static bool memory_region_need_escape(char c)
> @@ -1405,7 +1401,7 @@ void memory_region_init_rom_device(MemoryRegion *mr,
>      mr->opaque = opaque;
>      mr->terminates = true;
>      mr->rom_device = true;
> -    mr->destructor = memory_region_destructor_rom_device;
> +    mr->destructor = memory_region_destructor_ram;
>      mr->ram_block = qemu_ram_alloc(size, mr, errp);
>  }
>  
> -- 
> 2.7.4
> 
>