diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-02-06 16:39:04 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-02-06 16:39:04 -0600 |
| commit | bd4bd24ed3e33f4f0ffa9dde23b8b85430592dc6 (patch) | |
| tree | 569d71f4e7fa68316f037486f83b204eae31abed /linux-user/strace.c | |
| parent | 0bc8ce9460c1f51211e797a825432e55327b70c6 (diff) | |
| parent | c07ecc6866f8c5eb2e0b23ba20214000310355e0 (diff) | |
| download | focaccia-qemu-bd4bd24ed3e33f4f0ffa9dde23b8b85430592dc6.tar.gz focaccia-qemu-bd4bd24ed3e33f4f0ffa9dde23b8b85430592dc6.zip | |
Merge branch 'for-linux-user' of https://git.gitorious.org/qemu-m68k/qemu-m68k into staging
* 'for-linux-user' of https://git.gitorious.org/qemu-m68k/qemu-m68k: linux-user: correct reboot() linux-user: correct setsockopt() linux-user: correct print_timeval() swap tv_sec and tv_usec linux-user: correct msgrcv() Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'linux-user/strace.c')
| -rw-r--r-- | linux-user/strace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-user/strace.c b/linux-user/strace.c index 6ec90e8974..4e91a6eb9c 100644 --- a/linux-user/strace.c +++ b/linux-user/strace.c @@ -682,7 +682,7 @@ print_timeval(abi_ulong tv_addr, int last) if (!tv) return; gemu_log("{" TARGET_ABI_FMT_ld "," TARGET_ABI_FMT_ld "}%s", - tv->tv_sec, tv->tv_usec, get_comma(last)); + tswapal(tv->tv_sec), tswapal(tv->tv_usec), get_comma(last)); unlock_user(tv, tv_addr, 0); } else gemu_log("NULL%s", get_comma(last)); |