From 83234bf2fa4b28feb2accee823c56f2188eed48c Mon Sep 17 00:00:00 2001 From: Peter Crosthwaite Date: Thu, 14 Aug 2014 23:54:29 -0700 Subject: exec: Abstract away ref to memory region names Use the function provided rather than spying on the struct. Signed-off-by: Peter Crosthwaite Signed-off-by: Paolo Bonzini --- exec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/exec.c b/exec.c index 5a2a25e851..42688b69b1 100644 --- a/exec.c +++ b/exec.c @@ -1044,7 +1044,7 @@ static void *file_ram_alloc(RAMBlock *block, } /* 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++) { if (*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); if (!new_block->host) { 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); } memory_try_enable_merging(new_block->host, new_block->length); -- cgit v1.2.1