[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 10/12] linux-user/strace: Let print_sockaddr() ha
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH v4 10/12] linux-user/strace: Let print_sockaddr() have a 'last' argument |
Date: |
Tue, 3 Jul 2018 12:33:44 -0300 |
If the format is not the syscall last argument, a comma is append.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
---
linux-user/strace.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/linux-user/strace.c b/linux-user/strace.c
index 54060eed93..19222d2192 100644
--- a/linux-user/strace.c
+++ b/linux-user/strace.c
@@ -67,7 +67,7 @@ UNUSED static void print_timeval(abi_ulong, int);
UNUSED static void print_timezone(abi_ulong, int);
UNUSED static void print_number(abi_long, int);
UNUSED static void print_signal(abi_ulong, int);
-UNUSED static void print_sockaddr(abi_ulong addr, abi_long addrlen);
+UNUSED static void print_sockaddr(abi_ulong addr, abi_long addrlen, int);
UNUSED static void print_socket_domain(int domain);
UNUSED static void print_socket_type(int type);
UNUSED static void print_socket_protocol(int domain, int type, int protocol);
@@ -336,7 +336,7 @@ static void print_siginfo(const target_siginfo_t *tinfo)
}
static void
-print_sockaddr(abi_ulong addr, abi_long addrlen)
+print_sockaddr(abi_ulong addr, abi_long addrlen, int last)
{
struct target_sockaddr *sa;
int i;
@@ -418,7 +418,7 @@ print_sockaddr(abi_ulong addr, abi_long addrlen)
} else {
print_raw_param("0x"TARGET_ABI_FMT_lx, addr, 0);
}
- gemu_log(", "TARGET_ABI_FMT_ld, addrlen);
+ gemu_log(", "TARGET_ABI_FMT_ld"%s", addrlen, get_comma(last));
}
static void
@@ -1666,7 +1666,7 @@ static void do_print_sockaddr(const char *name, abi_long
arg1)
gemu_log("%s(", name);
print_sockfd(sockfd, 0);
- print_sockaddr(addr, addrlen);
+ print_sockaddr(addr, addrlen, 0);
gemu_log(")");
}
@@ -1736,7 +1736,7 @@ static void do_print_msgaddr(const char *name, abi_long
arg1)
print_buf(msg, len, 0);
print_raw_param(TARGET_ABI_FMT_ld, len, 0);
print_flags(msg_flags, flags, 0);
- print_sockaddr(addr, addrlen);
+ print_sockaddr(addr, addrlen, 0);
gemu_log(")");
}
--
2.18.0
- [Qemu-devel] [PATCH v4 00/12] linux-user: strace improvements, Philippe Mathieu-Daudé, 2018/07/03
- [Qemu-devel] [PATCH v4 01/12] linux-user/syscall: Verify recvfrom(addr) is user-writable, Philippe Mathieu-Daudé, 2018/07/03
- [Qemu-devel] [PATCH v4 02/12] linux-user/strace: Improve capget()/capset() output, Philippe Mathieu-Daudé, 2018/07/03
- [Qemu-devel] [PATCH v4 05/12] linux-user/strace: Improve settimeofday(), Philippe Mathieu-Daudé, 2018/07/03
- [Qemu-devel] [PATCH v4 06/12] linux-user/syscall: Introduce target_sockaddr_nl, Philippe Mathieu-Daudé, 2018/07/03
- [Qemu-devel] [PATCH v4 09/12] linux-user/strace: Add print_sockfd(), Philippe Mathieu-Daudé, 2018/07/03
- [Qemu-devel] [PATCH v4 08/12] linux-user/strace: Improve recvmsg() output, Philippe Mathieu-Daudé, 2018/07/03
- [Qemu-devel] [PATCH v4 10/12] linux-user/strace: Let print_sockaddr() have a 'last' argument,
Philippe Mathieu-Daudé <=