mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scripts/gdb: Fix a python exception in mtree.py

Browse Source 
The following exception is threw:
Python Exception <class 'NameError'> 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 <w90p710@gmail.com>
Message-id: 1449316340-4030-1-git-send-email-w90p710@gmail.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Yang Wei 2015-12-05 19:52:20 +08:00 committed by Stefan Hajnoczi
parent b4a9e25b7b
commit d6b6913276
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/qemugdb/mtree.py
View File

@ -21,7 +21,7 @@ def isnull(ptr):
return ptr == gdb.Value(0).cast(ptr.type) return ptr == gdb.Value(0).cast(ptr.type)
def int128(p): def int128(p):
return long(p['lo']) + (long(p['hi']) << 64) return int(p['lo']) + (int(p['hi']) << 64)
class MtreeCommand(gdb.Command): class MtreeCommand(gdb.Command):
'''Display the memory tree hierarchy''' '''Display the memory tree hierarchy'''
@ -40,11 +40,11 @@ class MtreeCommand(gdb.Command):
def process_queue(self): def process_queue(self):
while self.queue: while self.queue:
ptr = self.queue.pop(0) ptr = self.queue.pop(0)
if long(ptr) in self.seen: if int(ptr) in self.seen:
continue continue
self.print_item(ptr) self.print_item(ptr)
def print_item(self, ptr, offset = gdb.Value(0), level = 0): 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 = ptr['addr']
addr += offset addr += offset
size = int128(ptr['size']) size = int128(ptr['size'])
@ -58,8 +58,8 @@ class MtreeCommand(gdb.Command):
klass = ' (RAM)' klass = ' (RAM)'
gdb.write('%s%016x-%016x %s%s (@ %s)\n' gdb.write('%s%016x-%016x %s%s (@ %s)\n'
% (' ' * level, % (' ' * level,
long(addr), int(addr),
long(addr + (size - 1)), int(addr + (size - 1)),
ptr['name'].string(), ptr['name'].string(),
klass, klass,
ptr, ptr,