Commit fd1d9926 authored by Alex Williamson's avatar Alex Williamson Committed by Anthony Liguori
Browse files

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: default avatarAlex Williamson <alex.williamson@redhat.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-id: 20130719184124.15864.20803.stgit@bling.home
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 53db7854

memory.c

+6 −2
Original line number Diff line number Diff line
@@ -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'