summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Kardashevskiy <aik@ozlabs.ru>2013-08-30 18:10:38 +1000
committerMichael Roth <mdroth@linux.vnet.ibm.com>2013-12-03 16:05:41 -0600
commitbd821a9bc3cc4fc5fe8912deac883e6a4b00bc6a (patch)
treef79bf237babe4c8f1eec0bda2ea91335957247bd
parent7bda8555de4507685bc5713d1239f341718bbf1d (diff)
downloadqemu-bd821a9bc3cc4fc5fe8912deac883e6a4b00bc6a.tar.gz
memory: fix 128 arithmetic in info mtree
mtree_print_mr() calls int128_get64() in 3 places but only 2 places handle 2^64 correctly. This fixes the third call of int128_get64(). Cc: qemu-stable@nongnu.org Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> (cherry picked from commit a66670c79c5c7d530d818430ffcdaa25cbf2c2ab) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
-rw-r--r--memory.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/memory.c b/memory.c
index 5a10fd0bde..7f1f2661a5 100644
--- a/memory.c
+++ b/memory.c
@@ -1809,7 +1809,9 @@ static void mtree_print_mr(fprintf_function mon_printf, void *f,
mr->alias->name,
mr->alias_offset,
mr->alias_offset
- + (hwaddr)int128_get64(mr->size) - 1);
+ + (int128_nz(mr->size) ?
+ (hwaddr)int128_get64(int128_sub(mr->size,
+ int128_one())) : 0));
} else {
mon_printf(f,
TARGET_FMT_plx "-" TARGET_FMT_plx " (prio %d, %c%c): %s\n",