[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/16] mtree: also print disabled regions
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 04/16] mtree: also print disabled regions |
Date: |
Fri, 8 May 2015 14:07:49 +0200 |
From: Gerd Hoffmann <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
memory.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/memory.c b/memory.c
index 8fe6d79..03c536b 100644
--- a/memory.c
+++ b/memory.c
@@ -2089,7 +2089,7 @@ static void mtree_print_mr(fprintf_function mon_printf,
void *f,
const MemoryRegion *submr;
unsigned int i;
- if (!mr || !mr->enabled) {
+ if (!mr) {
return;
}
@@ -2115,7 +2115,7 @@ static void mtree_print_mr(fprintf_function mon_printf,
void *f,
}
mon_printf(f, TARGET_FMT_plx "-" TARGET_FMT_plx
" (prio %d, %c%c): alias %s @%s " TARGET_FMT_plx
- "-" TARGET_FMT_plx "\n",
+ "-" TARGET_FMT_plx "%s\n",
base + mr->addr,
base + mr->addr
+ (int128_nz(mr->size) ?
@@ -2131,10 +2131,11 @@ static void mtree_print_mr(fprintf_function mon_printf,
void *f,
mr->alias_offset
+ (int128_nz(mr->size) ?
(hwaddr)int128_get64(int128_sub(mr->size,
- int128_one())) : 0));
+ int128_one())) : 0),
+ mr->enabled ? "" : " [disabled]");
} else {
mon_printf(f,
- TARGET_FMT_plx "-" TARGET_FMT_plx " (prio %d, %c%c): %s\n",
+ TARGET_FMT_plx "-" TARGET_FMT_plx " (prio %d, %c%c):
%s%s\n",
base + mr->addr,
base + mr->addr
+ (int128_nz(mr->size) ?
@@ -2144,7 +2145,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'
: '-',
- memory_region_name(mr));
+ memory_region_name(mr),
+ mr->enabled ? "" : " [disabled]");
}
QTAILQ_INIT(&submr_print_queue);
--
2.3.5
- [Qemu-devel] [PULL 00/16] KVM, QOM, NBD, build fixes for 2015-05-08, Paolo Bonzini, 2015/05/08
- [Qemu-devel] [PULL 01/16] kvm: Silence warning from valgrind, Paolo Bonzini, 2015/05/08
- [Qemu-devel] [PULL 02/16] apic_common: improve readability of apic_reset_common, Paolo Bonzini, 2015/05/08
- [Qemu-devel] [PULL 03/16] mtree: tag & indent a bit better, Paolo Bonzini, 2015/05/08
- [Qemu-devel] [PULL 04/16] mtree: also print disabled regions,
Paolo Bonzini <=
- [Qemu-devel] [PULL 05/16] kvm: add support for memory transaction attributes, Paolo Bonzini, 2015/05/08
- [Qemu-devel] [PULL 06/16] exec: move rcu_read_lock/unlock to address_space_translate callers, Paolo Bonzini, 2015/05/08
- [Qemu-devel] [PULL 07/16] configure: require __thread support, Paolo Bonzini, 2015/05/08
- [Qemu-devel] [PULL 09/16] qom: document user creatable object types in help text, Paolo Bonzini, 2015/05/08
- [Qemu-devel] [PULL 08/16] qom: fix typename of 'policy' enum property in hostmem obj, Paolo Bonzini, 2015/05/08
- [Qemu-devel] [PULL 10/16] qom: create objects in two phases, Paolo Bonzini, 2015/05/08
- [Qemu-devel] [PULL 12/16] qom: make enum string tables const-correct, Paolo Bonzini, 2015/05/08
- [Qemu-devel] [PULL 11/16] qom: add object_new_propv / object_new_proplist constructors, Paolo Bonzini, 2015/05/08
- [Qemu-devel] [PULL 13/16] qom: add a object_property_add_enum helper method, Paolo Bonzini, 2015/05/08
- [Qemu-devel] [PULL 14/16] qom: don't pass string table to object_get_enum method, Paolo Bonzini, 2015/05/08