mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux-user: Correct print_sockaddr() format

Browse Source 
When the %addr argument can not be accessed, a double comma
is logged (the final qemu_log call prepend a comma).  Move
the comma from the final qemu_log to the preceeding switch
cases that had omitted it.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20240807124306.52903-2-philmd@linaro.org>
Acked-by: Ilya Leoshkevich <iii@linux.ibm.com>
[rth: Move comma into the various switch cases.]
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2024-10-05 11:09:13 -07:00 committed by Richard Henderson
parent 322bfaa2ea
commit 7db3a42ef6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
linux-user/strace.c
View File

@ -376,7 +376,7 @@ print_sockaddr(abi_ulong addr, abi_long addrlen, int last)
un->sun_path[i]; i++) { un->sun_path[i]; i++) {
qemu_log("%c", un->sun_path[i]); qemu_log("%c", un->sun_path[i]);
} }
qemu_log("\"}"); qemu_log("\"},");
break; break;
} }
case AF_INET: { case AF_INET: {
@ -386,7 +386,7 @@ print_sockaddr(abi_ulong addr, abi_long addrlen, int last)
ntohs(in->sin_port)); ntohs(in->sin_port));
qemu_log("sin_addr=inet_addr(\"%d.%d.%d.%d\")", qemu_log("sin_addr=inet_addr(\"%d.%d.%d.%d\")",
c[0], c[1], c[2], c[3]); c[0], c[1], c[2], c[3]);
qemu_log("}"); qemu_log("},");
break; break;
} }
case AF_PACKET: { case AF_PACKET: {
@ -417,12 +417,12 @@ print_sockaddr(abi_ulong addr, abi_long addrlen, int last)
} }
qemu_log(",sll_addr=%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x", qemu_log(",sll_addr=%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x",
c[0], c[1], c[2], c[3], c[4], c[5], c[6], c[7]); c[0], c[1], c[2], c[3], c[4], c[5], c[6], c[7]);
qemu_log("}"); qemu_log("},");
break; break;
} }
case AF_NETLINK: { case AF_NETLINK: {
struct target_sockaddr_nl *nl = (struct target_sockaddr_nl *)sa; struct target_sockaddr_nl *nl = (struct target_sockaddr_nl *)sa;
qemu_log("{nl_family=AF_NETLINK,nl_pid=%u,nl_groups=%u}", qemu_log("{nl_family=AF_NETLINK,nl_pid=%u,nl_groups=%u},",
tswap32(nl->nl_pid), tswap32(nl->nl_groups)); tswap32(nl->nl_pid), tswap32(nl->nl_groups));
break; break;
} }
@ -432,14 +432,14 @@ print_sockaddr(abi_ulong addr, abi_long addrlen, int last)
qemu_log("%02x, ", sa->sa_data[i]); qemu_log("%02x, ", sa->sa_data[i]);
} }
qemu_log("%02x}", sa->sa_data[i]); qemu_log("%02x}", sa->sa_data[i]);
qemu_log("}"); qemu_log("},");
break; break;
} }
unlock_user(sa, addr, 0); unlock_user(sa, addr, 0);
} else { } else {
print_raw_param("0x"TARGET_ABI_FMT_lx, addr, 0); print_raw_param("0x"TARGET_ABI_FMT_lx, addr, 0);
} }
qemu_log(", "TARGET_ABI_FMT_ld"%s", addrlen, get_comma(last)); qemu_log(TARGET_ABI_FMT_ld"%s", addrlen, get_comma(last));
} }
static void static void