[Xen-changelog] [qemu-upstream-unstable] memory: fix 128 arithmetic in info mtree

[patchbot@xxxxxxx]

commit bd821a9bc3cc4fc5fe8912deac883e6a4b00bc6a
Author:     Alexey Kardashevskiy <aik@xxxxxxxxx>
AuthorDate: Fri Aug 30 18:10:38 2013 +1000
Commit:     Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
CommitDate: Tue Dec 3 16:05:41 2013 -0600

    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@xxxxxxxxxx
    Signed-off-by: Alexey Kardashevskiy <aik@xxxxxxxxx>
    Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>
    (cherry picked from commit a66670c79c5c7d530d818430ffcdaa25cbf2c2ab)
    
    Signed-off-by: Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
---
 memory.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/memory.c b/memory.c
index 5a10fd0..7f1f266 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",
--
generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog