From fd1d9926e91f421bc851f9dd19875f14799c6e4b Mon Sep 17 00:00:00 2001 From: Alex Williamson Date: Fri, 19 Jul 2013 12:42:12 -0600 Subject: [PATCH] memory: Fix zero-sized memory region print if mr->size == 0, then int128_get64(int128_sub(mr->size, int128_make64(1))) => assert(!a.hi) Also, use int128_one(). Signed-off-by: Alex Williamson Reviewed-by: Paolo Bonzini Message-id: 20130719184124.15864.20803.stgit@bling.home Signed-off-by: Anthony Liguori --- memory.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/memory.c b/memory.c index 34a088e90f..01846c9768 100644 --- a/memory.c +++ b/memory.c @@ -1787,7 +1787,9 @@ static void mtree_print_mr(fprintf_function mon_printf, void *f, "-" TARGET_FMT_plx "\n", base + mr->addr, base + mr->addr - + (hwaddr)int128_get64(int128_sub(mr->size, int128_make64(1))), + + (int128_nz(mr->size) ? + (hwaddr)int128_get64(int128_sub(mr->size, + int128_one())) : 0), mr->priority, mr->romd_mode ? 'R' : '-', !mr->readonly && !(mr->rom_device && mr->romd_mode) ? 'W' @@ -1802,7 +1804,9 @@ static void mtree_print_mr(fprintf_function mon_printf, void *f, TARGET_FMT_plx "-" TARGET_FMT_plx " (prio %d, %c%c): %s\n", base + mr->addr, base + mr->addr - + (hwaddr)int128_get64(int128_sub(mr->size, int128_make64(1))), + + (int128_nz(mr->size) ? + (hwaddr)int128_get64(int128_sub(mr->size, + int128_one())) : 0), mr->priority, mr->romd_mode ? 'R' : '-', !mr->readonly && !(mr->rom_device && mr->romd_mode) ? 'W' -- 2.34.1