From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58580) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YqhiP-0003SB-Ib for qemu-devel@nongnu.org; Fri, 08 May 2015 08:49:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YqhiO-0002BZ-MH for qemu-devel@nongnu.org; Fri, 08 May 2015 08:49:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36308) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YqhiO-0002BS-IB for qemu-devel@nongnu.org; Fri, 08 May 2015 08:49:16 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 99FEF30600D for ; Fri, 8 May 2015 12:49:15 +0000 (UTC) From: Paolo Bonzini Date: Fri, 8 May 2015 14:48:59 +0200 Message-Id: <1431089344-20350-5-git-send-email-pbonzini@redhat.com> In-Reply-To: <1431089344-20350-1-git-send-email-pbonzini@redhat.com> References: <1431089344-20350-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 4/9] mtree: also print disabled regions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann From: Gerd Hoffmann Signed-off-by: Gerd Hoffmann Signed-off-by: Paolo Bonzini --- 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