OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

memory: reclaim resources when a memory region is destroyed for good 

Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Avi Kivity 2011-08-08 19:58:48 +03:00 committed by Anthony Liguori
parent 76dc3cf82c
commit 545e92e06a
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
memory.c
View File

@ -661,6 +661,25 @@ void memory_region_transaction_commit(void)
memory_region_update_topology(); memory_region_update_topology();
} }
static void memory_region_destructor_none(MemoryRegion *mr)
{
}
static void memory_region_destructor_ram(MemoryRegion *mr)
{
qemu_ram_free(mr->ram_addr);
}
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)
{
cpu_unregister_io_memory(mr->ram_addr);
}
void memory_region_init(MemoryRegion *mr, void memory_region_init(MemoryRegion *mr,
const char *name, const char *name,
uint64_t size) uint64_t size)
@ -671,6 +690,7 @@ void memory_region_init(MemoryRegion *mr,
mr->addr = 0; mr->addr = 0;
mr->offset = 0; mr->offset = 0;
mr->terminates = false; mr->terminates = false;
mr->destructor = memory_region_destructor_none;
mr->priority = 0; mr->priority = 0;
mr->may_overlap = false; mr->may_overlap = false;
mr->alias = NULL; mr->alias = NULL;
@ -833,6 +853,7 @@ static void memory_region_prepare_ram_addr(MemoryRegion *mr)
return; return;
} }
mr->destructor = memory_region_destructor_iomem;
mr->ram_addr = cpu_register_io_memory(memory_region_read_thunk, mr->ram_addr = cpu_register_io_memory(memory_region_read_thunk,
memory_region_write_thunk, memory_region_write_thunk,
mr, mr,
@ -860,6 +881,7 @@ void memory_region_init_ram(MemoryRegion *mr,
{ {
memory_region_init(mr, name, size); memory_region_init(mr, name, size);
mr->terminates = true; mr->terminates = true;
mr->destructor = memory_region_destructor_ram;
mr->ram_addr = qemu_ram_alloc(dev, name, size); mr->ram_addr = qemu_ram_alloc(dev, name, size);
mr->backend_registered = true; mr->backend_registered = true;
} }
@ -872,6 +894,7 @@ void memory_region_init_ram_ptr(MemoryRegion *mr,
{ {
memory_region_init(mr, name, size); memory_region_init(mr, name, size);
mr->terminates = true; mr->terminates = true;
mr->destructor = memory_region_destructor_ram_from_ptr;
mr->ram_addr = qemu_ram_alloc_from_ptr(dev, name, size, ptr); mr->ram_addr = qemu_ram_alloc_from_ptr(dev, name, size, ptr);
mr->backend_registered = true; mr->backend_registered = true;
} }
@ -890,6 +913,7 @@ void memory_region_init_alias(MemoryRegion *mr,
void memory_region_destroy(MemoryRegion *mr) void memory_region_destroy(MemoryRegion *mr)
{ {
assert(QTAILQ_EMPTY(&mr->subregions)); assert(QTAILQ_EMPTY(&mr->subregions));
mr->destructor(mr);
memory_region_clear_coalescing(mr); memory_region_clear_coalescing(mr);
qemu_free((char *)mr->name); qemu_free((char *)mr->name);
qemu_free(mr->ioeventfds); qemu_free(mr->ioeventfds);

1
memory.h
View File

@ -109,6 +109,7 @@ struct MemoryRegion {
target_phys_addr_t addr; target_phys_addr_t addr;
target_phys_addr_t offset; target_phys_addr_t offset;
bool backend_registered; bool backend_registered;
void (*destructor)(MemoryRegion *mr);
ram_addr_t ram_addr; ram_addr_t ram_addr;
IORange iorange; IORange iorange;
bool terminates; bool terminates;