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

exec: Abstract away ref to memory region names 

Use the function provided rather than spying on the struct.

Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Peter Crosthwaite 2014-08-14 23:54:29 -07:00 committed by Paolo Bonzini
parent 401cf7fdc4
commit 83234bf2fa
1 changed files with 2 additions and 2 deletions

4
exec.c
View File

@ -1044,7 +1044,7 @@ static void *file_ram_alloc(RAMBlock *block,
} }
/* Make name safe to use with mkstemp by replacing '/' with '_'. */ /* Make name safe to use with mkstemp by replacing '/' with '_'. */
sanitized_name = g_strdup(block->mr->name); sanitized_name = g_strdup(memory_region_name(block->mr));
for (c = sanitized_name; *c != '\0'; c++) { for (c = sanitized_name; *c != '\0'; c++) {
if (*c == '/') if (*c == '/')
*c = '_'; *c = '_';
@ -1242,7 +1242,7 @@ static ram_addr_t ram_block_add(RAMBlock *new_block)
new_block->host = phys_mem_alloc(new_block->length); new_block->host = phys_mem_alloc(new_block->length);
if (!new_block->host) { if (!new_block->host) {
fprintf(stderr, "Cannot set up guest memory '%s': %s\n", fprintf(stderr, "Cannot set up guest memory '%s': %s\n",
new_block->mr->name, strerror(errno)); memory_region_name(new_block->mr), strerror(errno));
exit(1); exit(1);
} }
memory_try_enable_merging(new_block->host, new_block->length); memory_try_enable_merging(new_block->host, new_block->length);