| Message ID | 20191021114857.20538-2-f4bug@amsat.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | linux-user: strace improvements | expand |
Le 21/10/2019 à 13:48, Philippe Mathieu-Daudé a écrit : > Suggested-by: Laurent Vivier <laurent@vivier.eu> > Reviewed-by: Laurent Vivier <laurent@vivier.eu> > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > linux-user/strace.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/linux-user/strace.c b/linux-user/strace.c > index c80e93b5db..f326c357a2 100644 > --- a/linux-user/strace.c > +++ b/linux-user/strace.c > @@ -1243,8 +1243,10 @@ print_timeval(abi_ulong tv_addr, int last) > struct target_timeval *tv; > > tv = lock_user(VERIFY_READ, tv_addr, sizeof(*tv), 1); > - if (!tv) > + if (!tv) { > + print_pointer(tv_addr, last); > return; > + } > gemu_log("{" TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld "}%s", > tswapal(tv->tv_sec), tswapal(tv->tv_usec), get_comma(last)); > unlock_user(tv, tv_addr, 0); > Applied to my linux-user branch. Thanks, Laurent
diff --git a/linux-user/strace.c b/linux-user/strace.c index c80e93b5db..f326c357a2 100644 --- a/linux-user/strace.c +++ b/linux-user/strace.c @@ -1243,8 +1243,10 @@ print_timeval(abi_ulong tv_addr, int last) struct target_timeval *tv; tv = lock_user(VERIFY_READ, tv_addr, sizeof(*tv), 1); - if (!tv) + if (!tv) { + print_pointer(tv_addr, last); return; + } gemu_log("{" TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld "}%s", tswapal(tv->tv_sec), tswapal(tv->tv_usec), get_comma(last)); unlock_user(tv, tv_addr, 0);