Skip to content

Commit

Permalink
memory: remove memory_region_destructor_rom_device
Browse files Browse the repository at this point in the history
It is equivalent to memory_region_destructor_ram, use that one.

Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
  • Loading branch information
bonzini committed Sep 14, 2016
1 parent 883e4f7 commit 58268c8
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions memory.c
Expand Up @@ -944,11 +944,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);
}

static bool memory_region_need_escape(char c)
{
return c == '/' || c == '[' || c == '\\' || c == ']';
Expand Down Expand Up @@ -1405,7 +1400,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);
}

Expand Down

0 comments on commit 58268c8

Please sign in to comment.