From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46116) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBIiv-0002CX-J9 for qemu-devel@nongnu.org; Tue, 22 Dec 2015 03:55:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aBIiu-0007kB-Ot for qemu-devel@nongnu.org; Tue, 22 Dec 2015 03:55:13 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40026) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBIiu-0007k7-Js for qemu-devel@nongnu.org; Tue, 22 Dec 2015 03:55:12 -0500 From: Stefan Hajnoczi Date: Tue, 22 Dec 2015 16:54:17 +0800 Message-Id: <1450774460-17259-8-git-send-email-stefanha@redhat.com> In-Reply-To: <1450774460-17259-1-git-send-email-stefanha@redhat.com> References: <1450774460-17259-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 07/10] scripts/gdb: Fix a python exception in mtree.py List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Stefan Hajnoczi , Yang Wei From: Yang Wei The following exception is threw: Python Exception name 'long' is not defined: Error occurred in Python command: name 'long' is not defined Python 2.4+, int()/long() have been unified, so replace long with int. Signed-off-by: Yang Wei Message-id: 1449316340-4030-1-git-send-email-w90p710@gmail.com Signed-off-by: Stefan Hajnoczi --- scripts/qemugdb/mtree.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/qemugdb/mtree.py b/scripts/qemugdb/mtree.py index 06011c3..cc8131c 100644 --- a/scripts/qemugdb/mtree.py +++ b/scripts/qemugdb/mtree.py @@ -21,7 +21,7 @@ def isnull(ptr): return ptr == gdb.Value(0).cast(ptr.type) def int128(p): - return long(p['lo']) + (long(p['hi']) << 64) + return int(p['lo']) + (int(p['hi']) << 64) class MtreeCommand(gdb.Command): '''Display the memory tree hierarchy''' @@ -40,11 +40,11 @@ class MtreeCommand(gdb.Command): def process_queue(self): while self.queue: ptr = self.queue.pop(0) - if long(ptr) in self.seen: + if int(ptr) in self.seen: continue self.print_item(ptr) def print_item(self, ptr, offset = gdb.Value(0), level = 0): - self.seen.add(long(ptr)) + self.seen.add(int(ptr)) addr = ptr['addr'] addr += offset size = int128(ptr['size']) @@ -58,8 +58,8 @@ class MtreeCommand(gdb.Command): klass = ' (RAM)' gdb.write('%s%016x-%016x %s%s (@ %s)\n' % (' ' * level, - long(addr), - long(addr + (size - 1)), + int(addr), + int(addr + (size - 1)), ptr['name'].string(), klass, ptr, -- 2.5.0