diff options
author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2017-03-10 15:28:19 +0400 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2017-03-14 13:26:36 +0100 |
commit | 9b4b157ef6edc5cf060aef3402bdece7f581b5a2 (patch) | |
tree | 07e3f571ae2a99f1872b8b3cf86c70065cc5432b /scripts | |
parent | ca2edcd35cd1a8589dfa0533c19ff232fec7b4b5 (diff) | |
download | qemu-9b4b157ef6edc5cf060aef3402bdece7f581b5a2.zip qemu-9b4b157ef6edc5cf060aef3402bdece7f581b5a2.tar.gz qemu-9b4b157ef6edc5cf060aef3402bdece7f581b5a2.tar.bz2 |
scripts/dump-guest-memory.py: fix int128_get64 on recent gcc
The Int128 is no longer a struct, reaching a python exception:
Python Exception <class 'gdb.error'> Attempt to extract a component of a value that is not a (null).:
Replace struct access with a cast to uint64[] instead.
Fixes:
https://bugzilla.redhat.com/show_bug.cgi?id=1427466
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20170310112819.16760-1-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/dump-guest-memory.py | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/scripts/dump-guest-memory.py b/scripts/dump-guest-memory.py index 9956fc0..f7c6635 100644 --- a/scripts/dump-guest-memory.py +++ b/scripts/dump-guest-memory.py @@ -314,8 +314,18 @@ def get_arch_phdr(endianness, elfclass): def int128_get64(val): """Returns low 64bit part of Int128 struct.""" - assert val["hi"] == 0 - return val["lo"] + try: + assert val["hi"] == 0 + return val["lo"] + except gdb.error: + u64t = gdb.lookup_type('uint64_t').array(2) + u64 = val.cast(u64t) + if sys.byteorder == 'little': + assert u64[1] == 0 + return u64[0] + else: + assert u64[0] == 0 + return u64[1] def qlist_foreach(head, field_str): |