Commit d6b69132 authored by Yang Wei's avatar Yang Wei Committed by Stefan Hajnoczi
Browse files

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



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: default avatarYang Wei <w90p710@gmail.com>
Message-id: 1449316340-4030-1-git-send-email-w90p710@gmail.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent b4a9e25b

scripts/qemugdb/mtree.py

+5 −5
Original line number Diff line number Diff line
@@ -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,