yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-05-02 02:16:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

exec: Return RAMBlock pointer from allocating functions

Browse source 
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.

Backports commit 528f46af6ecd1e300db18684969104d4067b867b from qemu
This commit is contained in:
Gonglei 2018-02-21 07:43:01 -05:00 committed by Lioncash
parent 893b9f7f96
commit aa80edbef0
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
3 changed files with 46 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
qemu/exec.c
View file

@ -1087,7 +1087,7 @@ int qemu_ram_resize(struct uc_struct *uc, ram_addr_t base, ram_addr_t newsize, E
return 0; return 0;
} }
static ram_addr_t ram_block_add(struct uc_struct *uc, RAMBlock *new_block, Error **errp) static void ram_block_add(struct uc_struct *uc, RAMBlock *new_block, Error **errp)
{ {
RAMBlock *block; RAMBlock *block;
RAMBlock *last_block = NULL; RAMBlock *last_block = NULL;
@ -1104,7 +1104,6 @@ static ram_addr_t ram_block_add(struct uc_struct *uc, RAMBlock *new_block, Error
error_setg_errno(errp, errno, error_setg_errno(errp, errno,
"cannot set up guest memory '%s'", "cannot set up guest memory '%s'",
memory_region_name(new_block->mr)); memory_region_name(new_block->mr));
return -1;
} }
memory_try_enable_merging(new_block->host, new_block->max_length); memory_try_enable_merging(new_block->host, new_block->max_length);
} }
@ -1155,13 +1154,10 @@ static ram_addr_t ram_block_add(struct uc_struct *uc, RAMBlock *new_block, Error
// 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;
} }
// return -1 on error
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),
@ -1169,14 +1165,13 @@ 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 = TARGET_PAGE_ALIGN(size); size = TARGET_PAGE_ALIGN(size);
max_size = TARGET_PAGE_ALIGN(max_size); max_size = TARGET_PAGE_ALIGN(max_size);
new_block = g_malloc0(sizeof(*new_block)); new_block = g_malloc0(sizeof(*new_block));
if (new_block == NULL) { if (new_block == NULL) {
return -1; return NULL;
} }
new_block->mr = mr; new_block->mr = mr;
new_block->resized = resized; new_block->resized = resized;
@ -1191,28 +1186,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(mr->uc, new_block, &local_err); ram_block_add(mr->uc, 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),

6
qemu/include/exec/ram_addr.h
View file

@ -53,10 +53,10 @@ static inline void *ramblock_ptr(RAMBlock *block, ram_addr_t offset)
return (char *)block->host + offset; return (char *)block->host + offset;
} }
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),

31
qemu/memory.c
View file

@ -1163,6 +1163,8 @@ void memory_region_init_ram(struct uc_struct *uc, MemoryRegion *mr,
uint32_t perms, uint32_t perms,
Error **errp) Error **errp)
{ {
RAMBlock *ram_block;
memory_region_init(uc, mr, owner, name, size); memory_region_init(uc, mr, owner, name, size);
mr->ram = true; mr->ram = true;
if (!(perms & UC_PROT_WRITE)) { if (!(perms & UC_PROT_WRITE)) {
@ -1171,7 +1173,8 @@ void memory_region_init_ram(struct uc_struct *uc, MemoryRegion *mr,
mr->perms = perms; mr->perms = perms;
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(uc) ? (1 << DIRTY_MEMORY_CODE) : 0; mr->dirty_log_mask = tcg_enabled(uc) ? (1 << DIRTY_MEMORY_CODE) : 0;
} }
@ -1181,6 +1184,7 @@ void memory_region_init_ram_ptr(struct uc_struct *uc, MemoryRegion *mr,
uint64_t size, uint64_t size,
void *ptr) void *ptr)
{ {
RAMBlock *ram_block;
memory_region_init(uc, mr, owner, name, size); memory_region_init(uc, mr, owner, name, size);
mr->ram = true; mr->ram = true;
mr->terminates = true; mr->terminates = true;
@ -1189,7 +1193,8 @@ void memory_region_init_ram_ptr(struct uc_struct *uc, 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_abort); ram_block = qemu_ram_alloc_from_ptr(size, ptr, mr, &error_abort);
mr->ram_addr = ram_block->offset;
} }
void memory_region_init_resizeable_ram(struct uc_struct *uc, void memory_region_init_resizeable_ram(struct uc_struct *uc,
@ -1203,11 +1208,14 @@ void memory_region_init_resizeable_ram(struct uc_struct *uc,
void *host), void *host),
Error **errp) Error **errp)
{ {
RAMBlock *ram_block;
memory_region_init(uc, mr, owner, name, size); memory_region_init(uc, 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(uc) ? (1 << DIRTY_MEMORY_CODE) : 0; mr->dirty_log_mask = tcg_enabled(uc) ? (1 << DIRTY_MEMORY_CODE) : 0;
} }
@ -1367,13 +1375,22 @@ int memory_region_get_fd(MemoryRegion *mr)
void *memory_region_get_ram_ptr(MemoryRegion *mr) void *memory_region_get_ram_ptr(MemoryRegion *mr)
{ {
if (mr->alias) { void *ptr;
return (char*)memory_region_get_ram_ptr(mr->alias) + mr->alias_offset; uint64_t offset = 0;
// Unicorn: commented out
// rcu_read_lock();
while (mr->alias) {
offset += mr->alias_offset;
mr = mr->alias;
} }
assert(mr->terminates); assert(mr->ram_addr != RAM_ADDR_INVALID);
ptr = qemu_get_ram_ptr(mr->uc, mr->ram_block, mr->ram_addr & TARGET_PAGE_MASK);
// Unicorn: commented out
//rcu_read_unlock();
return qemu_get_ram_ptr(mr->uc, mr->ram_block, mr->ram_addr & TARGET_PAGE_MASK); return ptr + offset;
} }
bool memory_region_test_and_clear_dirty(MemoryRegion *mr, hwaddr addr, bool memory_region_test_and_clear_dirty(MemoryRegion *mr, hwaddr addr,