From 3fb18b4da7a545321e38b4a59f38995630a8d752 Mon Sep 17 00:00:00 2001 From: Peter Crosthwaite Date: Thu, 14 Aug 2014 23:55:36 -0700 Subject: memory: Use memory_region_name for name access Despite being local to memory.c, use the helper function. This prepares support for fully QOMifiying the name field of MR (which will remove this state from MR completely). Signed-off-by: Peter Crosthwaite Signed-off-by: Paolo Bonzini --- memory.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/memory.c b/memory.c index 1cde6ff660..b6b208fa95 100644 --- a/memory.c +++ b/memory.c @@ -2027,8 +2027,8 @@ static void mtree_print_mr(fprintf_function mon_printf, void *f, mr->romd_mode ? 'R' : '-', !mr->readonly && !(mr->rom_device && mr->romd_mode) ? 'W' : '-', - mr->name, - mr->alias->name, + memory_region_name(mr), + memory_region_name(mr->alias), mr->alias_offset, mr->alias_offset + (int128_nz(mr->size) ? @@ -2046,7 +2046,7 @@ static void mtree_print_mr(fprintf_function mon_printf, void *f, mr->romd_mode ? 'R' : '-', !mr->readonly && !(mr->rom_device && mr->romd_mode) ? 'W' : '-', - mr->name); + memory_region_name(mr)); } QTAILQ_INIT(&submr_print_queue); @@ -2095,7 +2095,7 @@ void mtree_info(fprintf_function mon_printf, void *f) /* print aliased regions */ QTAILQ_FOREACH(ml, &ml_head, queue) { if (!ml->printed) { - mon_printf(f, "%s\n", ml->mr->name); + mon_printf(f, "%s\n", memory_region_name(ml->mr)); mtree_print_mr(mon_printf, f, ml->mr, 0, 0, &ml_head); } } -- cgit v1.2.1