[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/10] scripts/gdb: Fix a python exception in mtree.p
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 07/10] scripts/gdb: Fix a python exception in mtree.py |
Date: |
Tue, 22 Dec 2015 16:54:17 +0800 |
From: Yang Wei <address@hidden>
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 <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
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
- [Qemu-devel] [PULL 00/10] Block patches, Stefan Hajnoczi, 2015/12/22
- [Qemu-devel] [PULL 01/10] virtio-blk: trivial code optimization, Stefan Hajnoczi, 2015/12/22
- [Qemu-devel] [PULL 02/10] block: add BlockLimits.max_iov field, Stefan Hajnoczi, 2015/12/22
- [Qemu-devel] [PULL 03/10] block-backend: add blk_get_max_iov(), Stefan Hajnoczi, 2015/12/22
- [Qemu-devel] [PULL 04/10] block: replace IOV_MAX with BlockLimits.max_iov, Stefan Hajnoczi, 2015/12/22
- [Qemu-devel] [PULL 05/10] block/mirror: replace IOV_MAX with blk_get_max_iov(), Stefan Hajnoczi, 2015/12/22
- [Qemu-devel] [PULL 06/10] parallels: add format spec, Stefan Hajnoczi, 2015/12/22
- [Qemu-devel] [PULL 07/10] scripts/gdb: Fix a python exception in mtree.py,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 08/10] sd: sdhci: Delete over-zealous power check, Stefan Hajnoczi, 2015/12/22
- [Qemu-devel] [PULL 09/10] sdhci: don't raise a command index error for an unexpected response, Stefan Hajnoczi, 2015/12/22
- [Qemu-devel] [PULL 10/10] sdhci: add optional quirk property to disable card insertion/removal interrupts, Stefan Hajnoczi, 2015/12/22
- Re: [Qemu-devel] [PULL 00/10] Block patches, Peter Maydell, 2015/12/22