qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH v2] scripts/gdb: Fix a python exception in mtree.py
@ 2015-12-04 13:06 Yang Wei
  0 siblings, 0 replies; 4+ messages in thread
From: Yang Wei @ 2015-12-04 13:06 UTC (permalink / raw)
  To: blauwirbel, stefanha, peter.maydell; +Cc: qemu-devel

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>
---
 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,
--
1.9.1

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [Qemu-devel] [PATCH v2] scripts/gdb: Fix a python exception in mtree.py
@ 2015-12-05 11:52 Yang Wei
  2015-12-07  5:35 ` Zhang Yang
  2015-12-07  7:26 ` Stefan Hajnoczi
  0 siblings, 2 replies; 4+ messages in thread
From: Yang Wei @ 2015-12-05 11:52 UTC (permalink / raw)
  To: blauwirbel, stefanha, peter.maydell; +Cc: qemu-devel

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>
---
 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,
--
1.9.1

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [Qemu-devel] [PATCH v2] scripts/gdb: Fix a python exception in mtree.py
  2015-12-05 11:52 Yang Wei
@ 2015-12-07  5:35 ` Zhang Yang
  2015-12-07  7:26 ` Stefan Hajnoczi
  1 sibling, 0 replies; 4+ messages in thread
From: Zhang Yang @ 2015-12-07  5:35 UTC (permalink / raw)
  To: Blue Swirl, stefanha, Peter Maydell; +Cc: qemu-devel

[-- Attachment #1: Type: text/plain, Size: 1921 bytes --]

ping

Wei

2015-12-05 19:52 GMT+08:00 Yang Wei <w90p710@gmail.com>:

> 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>
> ---
>  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,
> --
> 1.9.1
>
>

[-- Attachment #2: Type: text/html, Size: 2774 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [Qemu-devel] [PATCH v2] scripts/gdb: Fix a python exception in mtree.py
  2015-12-05 11:52 Yang Wei
  2015-12-07  5:35 ` Zhang Yang
@ 2015-12-07  7:26 ` Stefan Hajnoczi
  1 sibling, 0 replies; 4+ messages in thread
From: Stefan Hajnoczi @ 2015-12-07  7:26 UTC (permalink / raw)
  To: Yang Wei; +Cc: blauwirbel, peter.maydell, qemu-devel, stefanha

[-- Attachment #1: Type: text/plain, Size: 569 bytes --]

On Sat, Dec 05, 2015 at 07:52:20PM +0800, Yang Wei wrote:
> 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>
> ---
>  scripts/qemugdb/mtree.py | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)

Thanks, applied to my block-next tree:
https://github.com/stefanha/qemu/commits/block-next

Stefan

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2015-12-07  7:26 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-04 13:06 [Qemu-devel] [PATCH v2] scripts/gdb: Fix a python exception in mtree.py Yang Wei
  -- strict thread matches above, loose matches on Subject: below --
2015-12-05 11:52 Yang Wei
2015-12-07  5:35 ` Zhang Yang
2015-12-07  7:26 ` Stefan Hajnoczi

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).