mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

memory: Use memory_region_name for name access

Browse Source 
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 <peter.crosthwaite@xilinx.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Peter Crosthwaite 2014-08-14 23:55:36 -07:00 committed by Paolo Bonzini
parent 5d546d4b65
commit 3fb18b4da7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
memory.c
View File

@ -2027,8 +2027,8 @@ static void mtree_print_mr(fprintf_function mon_printf, void *f,
mr->romd_mode ? 'R' : '-', mr->romd_mode ? 'R' : '-',
!mr->readonly && !(mr->rom_device && mr->romd_mode) ? 'W' !mr->readonly && !(mr->rom_device && mr->romd_mode) ? 'W'
: '-', : '-',
mr->name, memory_region_name(mr),
mr->alias->name, memory_region_name(mr->alias),
mr->alias_offset, mr->alias_offset,
mr->alias_offset mr->alias_offset
+ (int128_nz(mr->size) ? + (int128_nz(mr->size) ?
@ -2046,7 +2046,7 @@ static void mtree_print_mr(fprintf_function mon_printf, void *f,
mr->romd_mode ? 'R' : '-', mr->romd_mode ? 'R' : '-',
!mr->readonly && !(mr->rom_device && mr->romd_mode) ? 'W' !mr->readonly && !(mr->rom_device && mr->romd_mode) ? 'W'
: '-', : '-',
mr->name); memory_region_name(mr));
} }
QTAILQ_INIT(&submr_print_queue); QTAILQ_INIT(&submr_print_queue);
@ -2095,7 +2095,7 @@ void mtree_info(fprintf_function mon_printf, void *f)
/* print aliased regions */ /* print aliased regions */
QTAILQ_FOREACH(ml, &ml_head, queue) { QTAILQ_FOREACH(ml, &ml_head, queue) {
if (!ml->printed) { 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); mtree_print_mr(mon_printf, f, ml->mr, 0, 0, &ml_head);
} }
} }