david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

memory: Fix zero-sized memory region print

Browse Source 
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 <alex.williamson@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 20130719184124.15864.20803.stgit@bling.home
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Alex Williamson 2013-07-19 12:42:12 -06:00 committed by Anthony Liguori
parent 53db78543e
commit fd1d9926e9
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
memory.c
View File

@ -1787,7 +1787,9 @@ static void mtree_print_mr(fprintf_function mon_printf, void *f,
"-" TARGET_FMT_plx "\n", "-" TARGET_FMT_plx "\n",
base + mr->addr, base + mr->addr,
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->priority,
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'
@ -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", TARGET_FMT_plx "-" TARGET_FMT_plx " (prio %d, %c%c): %s\n",
base + mr->addr, base + mr->addr,
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->priority,
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'