[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCHv2] scripts/dump-guest-memory.py: fix int128_get6
From: |
Laszlo Ersek |
Subject: |
Re: [Qemu-devel] [PATCHv2] scripts/dump-guest-memory.py: fix int128_get64 on recent gcc |
Date: |
Sat, 11 Mar 2017 03:01:23 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 |
On 03/10/17 12:28, Marc-André Lureau wrote:
> 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 <address@hidden>
> ---
> v2:
> - try with old struct hi/lo fields first for compatibility
> - handle endianess in uint64[] case
>
> Note: untested on other arch than x86_64
>
> scripts/dump-guest-memory.py | 14 ++++++++++++--
> 1 file changed, 12 insertions(+), 2 deletions(-)
>
> diff --git a/scripts/dump-guest-memory.py b/scripts/dump-guest-memory.py
> index 9956fc036c..f7c6635f15 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):
>
Reviewed-by: Laszlo Ersek <address@hidden>