ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

exec: Return RAMBlock pointer from allocating functions 

Previously we return RAMBlock.offset; now return the pointer to the
whole structure.

ram_block_add returns void now, error is completely passed with errp.

Reviewed-by: Gonglei <arei.gonglei@huawei.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
Message-Id: <1456813104-25902-2-git-send-email-famz@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Fam Zheng 2016-03-01 14:18:18 +08:00 committed by Paolo Bonzini
parent bb8f32c031
commit 528f46af6e
3 changed files with 53 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
exec.c
View File

@ -1554,7 +1554,7 @@ static void dirty_memory_extend(ram_addr_t old_ram_size,
} }
} }
static ram_addr_t ram_block_add(RAMBlock *new_block, Error **errp) static void ram_block_add(RAMBlock *new_block, Error **errp)
{ {
RAMBlock *block; RAMBlock *block;
RAMBlock *last_block = NULL; RAMBlock *last_block = NULL;
@ -1573,7 +1573,6 @@ static ram_addr_t ram_block_add(RAMBlock *new_block, Error **errp)
if (err) { if (err) {
error_propagate(errp, err); error_propagate(errp, err);
qemu_mutex_unlock_ramlist(); qemu_mutex_unlock_ramlist();
return -1;
} }
} else { } else {
new_block->host = phys_mem_alloc(new_block->max_length, new_block->host = phys_mem_alloc(new_block->max_length,
@ -1583,7 +1582,6 @@ static ram_addr_t ram_block_add(RAMBlock *new_block, Error **errp)
"cannot set up guest memory '%s'", "cannot set up guest memory '%s'",
memory_region_name(new_block->mr)); memory_region_name(new_block->mr));
qemu_mutex_unlock_ramlist(); qemu_mutex_unlock_ramlist();
return -1;
} }
memory_try_enable_merging(new_block->host, new_block->max_length); memory_try_enable_merging(new_block->host, new_block->max_length);
} }
@ -1631,22 +1629,19 @@ static ram_addr_t ram_block_add(RAMBlock *new_block, Error **errp)
kvm_setup_guest_memory(new_block->host, new_block->max_length); kvm_setup_guest_memory(new_block->host, new_block->max_length);
} }
} }
return new_block->offset;
} }
#ifdef __linux__ #ifdef __linux__
ram_addr_t qemu_ram_alloc_from_file(ram_addr_t size, MemoryRegion *mr, RAMBlock *qemu_ram_alloc_from_file(ram_addr_t size, MemoryRegion *mr,
bool share, const char *mem_path, bool share, const char *mem_path,
Error **errp) Error **errp)
{ {
RAMBlock *new_block; RAMBlock *new_block;
ram_addr_t addr;
Error *local_err = NULL; Error *local_err = NULL;
if (xen_enabled()) { if (xen_enabled()) {
error_setg(errp, "-mem-path not supported with Xen"); error_setg(errp, "-mem-path not supported with Xen");
return -1; return NULL;
} }
if (phys_mem_alloc != qemu_anon_ram_alloc) { if (phys_mem_alloc != qemu_anon_ram_alloc) {
@ -1657,7 +1652,7 @@ ram_addr_t qemu_ram_alloc_from_file(ram_addr_t size, MemoryRegion *mr,
*/ */
error_setg(errp, error_setg(errp,
"-mem-path not supported with this accelerator"); "-mem-path not supported with this accelerator");
return -1; return NULL;
} }
size = HOST_PAGE_ALIGN(size); size = HOST_PAGE_ALIGN(size);
@ -1670,21 +1665,21 @@ ram_addr_t qemu_ram_alloc_from_file(ram_addr_t size, MemoryRegion *mr,
mem_path, errp); mem_path, errp);
if (!new_block->host) { if (!new_block->host) {
g_free(new_block); g_free(new_block);
return -1; return NULL;
} }
addr = ram_block_add(new_block, &local_err); ram_block_add(new_block, &local_err);
if (local_err) { if (local_err) {
g_free(new_block); g_free(new_block);
error_propagate(errp, local_err); error_propagate(errp, local_err);
return -1; return NULL;
} }
return addr; return new_block;
} }
#endif #endif
static static
ram_addr_t qemu_ram_alloc_internal(ram_addr_t size, ram_addr_t max_size, RAMBlock *qemu_ram_alloc_internal(ram_addr_t size, ram_addr_t max_size,
void (*resized)(const char*, void (*resized)(const char*,
uint64_t length, uint64_t length,
void *host), void *host),
@ -1692,7 +1687,6 @@ ram_addr_t qemu_ram_alloc_internal(ram_addr_t size, ram_addr_t max_size,
MemoryRegion *mr, Error **errp) MemoryRegion *mr, Error **errp)
{ {
RAMBlock *new_block; RAMBlock *new_block;
ram_addr_t addr;
Error *local_err = NULL; Error *local_err = NULL;
size = HOST_PAGE_ALIGN(size); size = HOST_PAGE_ALIGN(size);
@ -1711,29 +1705,28 @@ ram_addr_t qemu_ram_alloc_internal(ram_addr_t size, ram_addr_t max_size,
if (resizeable) { if (resizeable) {
new_block->flags |= RAM_RESIZEABLE; new_block->flags |= RAM_RESIZEABLE;
} }
addr = ram_block_add(new_block, &local_err); ram_block_add(new_block, &local_err);
if (local_err) { if (local_err) {
g_free(new_block); g_free(new_block);
error_propagate(errp, local_err); error_propagate(errp, local_err);
return -1; return NULL;
} }
mr->ram_block = new_block; mr->ram_block = new_block;
return addr; return new_block;
} }
ram_addr_t qemu_ram_alloc_from_ptr(ram_addr_t size, void *host, RAMBlock *qemu_ram_alloc_from_ptr(ram_addr_t size, void *host,
MemoryRegion *mr, Error **errp) MemoryRegion *mr, Error **errp)
{ {
return qemu_ram_alloc_internal(size, size, NULL, host, false, mr, errp); return qemu_ram_alloc_internal(size, size, NULL, host, false, mr, errp);
} }
ram_addr_t qemu_ram_alloc(ram_addr_t size, MemoryRegion *mr, Error **errp) RAMBlock *qemu_ram_alloc(ram_addr_t size, MemoryRegion *mr, Error **errp)
{ {
return qemu_ram_alloc_internal(size, size, NULL, NULL, false, mr, errp); return qemu_ram_alloc_internal(size, size, NULL, NULL, false, mr, errp);
} }
ram_addr_t qemu_ram_alloc_resizeable(ram_addr_t size, ram_addr_t maxsz, RAMBlock *qemu_ram_alloc_resizeable(ram_addr_t size, ram_addr_t maxsz,
void (*resized)(const char*, void (*resized)(const char*,
uint64_t length, uint64_t length,
void *host), void *host),

8
include/exec/ram_addr.h
View File

@ -94,13 +94,13 @@ ram_addr_t last_ram_offset(void);
void qemu_mutex_lock_ramlist(void); void qemu_mutex_lock_ramlist(void);
void qemu_mutex_unlock_ramlist(void); void qemu_mutex_unlock_ramlist(void);
ram_addr_t qemu_ram_alloc_from_file(ram_addr_t size, MemoryRegion *mr, RAMBlock *qemu_ram_alloc_from_file(ram_addr_t size, MemoryRegion *mr,
bool share, const char *mem_path, bool share, const char *mem_path,
Error **errp); Error **errp);
ram_addr_t qemu_ram_alloc_from_ptr(ram_addr_t size, void *host, RAMBlock *qemu_ram_alloc_from_ptr(ram_addr_t size, void *host,
MemoryRegion *mr, Error **errp); MemoryRegion *mr, Error **errp);
ram_addr_t qemu_ram_alloc(ram_addr_t size, MemoryRegion *mr, Error **errp); RAMBlock *qemu_ram_alloc(ram_addr_t size, MemoryRegion *mr, Error **errp);
ram_addr_t qemu_ram_alloc_resizeable(ram_addr_t size, ram_addr_t max_size, RAMBlock *qemu_ram_alloc_resizeable(ram_addr_t size, ram_addr_t max_size,
void (*resized)(const char*, void (*resized)(const char*,
uint64_t length, uint64_t length,
void *host), void *host),

25
memory.c
View File

@ -1270,11 +1270,14 @@ void memory_region_init_ram(MemoryRegion *mr,
uint64_t size, uint64_t size,
Error **errp) Error **errp)
{ {
RAMBlock *ram_block;
memory_region_init(mr, owner, name, size); memory_region_init(mr, owner, name, size);
mr->ram = true; mr->ram = true;
mr->terminates = true; mr->terminates = true;
mr->destructor = memory_region_destructor_ram; mr->destructor = memory_region_destructor_ram;
mr->ram_addr = qemu_ram_alloc(size, mr, errp); ram_block = qemu_ram_alloc(size, mr, errp);
mr->ram_addr = ram_block->offset;
mr->dirty_log_mask = tcg_enabled() ? (1 << DIRTY_MEMORY_CODE) : 0; mr->dirty_log_mask = tcg_enabled() ? (1 << DIRTY_MEMORY_CODE) : 0;
} }
@ -1288,11 +1291,14 @@ void memory_region_init_resizeable_ram(MemoryRegion *mr,
void *host), void *host),
Error **errp) Error **errp)
{ {
RAMBlock *ram_block;
memory_region_init(mr, owner, name, size); memory_region_init(mr, owner, name, size);
mr->ram = true; mr->ram = true;
mr->terminates = true; mr->terminates = true;
mr->destructor = memory_region_destructor_ram; mr->destructor = memory_region_destructor_ram;
mr->ram_addr = qemu_ram_alloc_resizeable(size, max_size, resized, mr, errp); ram_block = qemu_ram_alloc_resizeable(size, max_size, resized, mr, errp);
mr->ram_addr = ram_block->offset;
mr->dirty_log_mask = tcg_enabled() ? (1 << DIRTY_MEMORY_CODE) : 0; mr->dirty_log_mask = tcg_enabled() ? (1 << DIRTY_MEMORY_CODE) : 0;
} }
@ -1305,11 +1311,14 @@ void memory_region_init_ram_from_file(MemoryRegion *mr,
const char *path, const char *path,
Error **errp) Error **errp)
{ {
RAMBlock *ram_block;
memory_region_init(mr, owner, name, size); memory_region_init(mr, owner, name, size);
mr->ram = true; mr->ram = true;
mr->terminates = true; mr->terminates = true;
mr->destructor = memory_region_destructor_ram; mr->destructor = memory_region_destructor_ram;
mr->ram_addr = qemu_ram_alloc_from_file(size, mr, share, path, errp); ram_block = qemu_ram_alloc_from_file(size, mr, share, path, errp);
mr->ram_addr = ram_block->offset;
mr->dirty_log_mask = tcg_enabled() ? (1 << DIRTY_MEMORY_CODE) : 0; mr->dirty_log_mask = tcg_enabled() ? (1 << DIRTY_MEMORY_CODE) : 0;
} }
#endif #endif
@ -1320,6 +1329,8 @@ void memory_region_init_ram_ptr(MemoryRegion *mr,
uint64_t size, uint64_t size,
void *ptr) void *ptr)
{ {
RAMBlock *ram_block;
memory_region_init(mr, owner, name, size); memory_region_init(mr, owner, name, size);
mr->ram = true; mr->ram = true;
mr->terminates = true; mr->terminates = true;
@ -1328,7 +1339,8 @@ void memory_region_init_ram_ptr(MemoryRegion *mr,
/* qemu_ram_alloc_from_ptr cannot fail with ptr != NULL. */ /* qemu_ram_alloc_from_ptr cannot fail with ptr != NULL. */
assert(ptr != NULL); assert(ptr != NULL);
mr->ram_addr = qemu_ram_alloc_from_ptr(size, ptr, mr, &error_fatal); ram_block = qemu_ram_alloc_from_ptr(size, ptr, mr, &error_fatal);
mr->ram_addr = ram_block->offset;
} }
void memory_region_set_skip_dump(MemoryRegion *mr) void memory_region_set_skip_dump(MemoryRegion *mr)
@ -1356,13 +1368,16 @@ void memory_region_init_rom_device(MemoryRegion *mr,
uint64_t size, uint64_t size,
Error **errp) Error **errp)
{ {
RAMBlock *ram_block;
memory_region_init(mr, owner, name, size); memory_region_init(mr, owner, name, size);
mr->ops = ops; mr->ops = ops;
mr->opaque = opaque; mr->opaque = opaque;
mr->terminates = true; mr->terminates = true;
mr->rom_device = true; mr->rom_device = true;
mr->destructor = memory_region_destructor_rom_device; mr->destructor = memory_region_destructor_rom_device;
mr->ram_addr = qemu_ram_alloc(size, mr, errp); ram_block = qemu_ram_alloc(size, mr, errp);
mr->ram_addr = ram_block->offset;
} }
void memory_region_init_iommu(MemoryRegion *mr, void memory_region_init_iommu(MemoryRegion *mr,