OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

linux-user: Use `qemu_log' for non-strace logging 

Since most calls to `gemu_log` are actually logging unimplemented features,
this change replaces most non-strace calls to `gemu_log` with calls to
`qemu_log_mask(LOG_UNIMP, ...)`.  This allows the user to easily log to
a file, and to mask out these log messages if they desire.

Note: This change is slightly backwards incompatible, since now these
"unimplemented" log messages will not be logged by default.

Signed-off-by: Josh Kunz <jkz@google.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20200204025416.111409-2-jkz@google.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Josh Kunz 2020-02-03 18:54:13 -08:00 committed by Laurent Vivier
parent e10ee3f567
commit 39be535008
4 changed files with 62 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
linux-user/arm/cpu_loop.c
View File

@ -349,8 +349,9 @@ void cpu_loop(CPUARMState *env)
env->regs[0] = cpu_get_tls(env); env->regs[0] = cpu_get_tls(env);
break; break;
default: default:
gemu_log("qemu: Unsupported ARM syscall: 0x%x\n", qemu_log_mask(LOG_UNIMP,
n); "qemu: Unsupported ARM syscall: 0x%x\n",
n);
env->regs[0] = -TARGET_ENOSYS; env->regs[0] = -TARGET_ENOSYS;
break; break;
} }

55
linux-user/fd-trans.c
View File

@ -514,7 +514,8 @@ static abi_long host_to_target_data_bridge_nlattr(struct nlattr *nlattr,
u32[1] = tswap32(u32[1]); /* optmask */ u32[1] = tswap32(u32[1]); /* optmask */
break; break;
default: default:
gemu_log("Unknown QEMU_IFLA_BR type %d\n", nlattr->nla_type); qemu_log_mask(LOG_UNIMP, "Unknown QEMU_IFLA_BR type %d\n",
nlattr->nla_type);
break; break;
} }
return 0; return 0;
@ -577,7 +578,8 @@ static abi_long host_to_target_slave_data_bridge_nlattr(struct nlattr *nlattr,
case QEMU_IFLA_BRPORT_BRIDGE_ID: case QEMU_IFLA_BRPORT_BRIDGE_ID:
break; break;
default: default:
gemu_log("Unknown QEMU_IFLA_BRPORT type %d\n", nlattr->nla_type); qemu_log_mask(LOG_UNIMP, "Unknown QEMU_IFLA_BRPORT type %d\n",
nlattr->nla_type);
break; break;
} }
return 0; return 0;
@ -605,7 +607,8 @@ static abi_long host_to_target_data_tun_nlattr(struct nlattr *nlattr,
*u32 = tswap32(*u32); *u32 = tswap32(*u32);
break; break;
default: default:
gemu_log("Unknown QEMU_IFLA_TUN type %d\n", nlattr->nla_type); qemu_log_mask(LOG_UNIMP, "Unknown QEMU_IFLA_TUN type %d\n",
nlattr->nla_type);
break; break;
} }
return 0; return 0;
@ -652,7 +655,8 @@ static abi_long host_to_target_data_linkinfo_nlattr(struct nlattr *nlattr,
NULL, NULL,
host_to_target_data_tun_nlattr); host_to_target_data_tun_nlattr);
} else { } else {
gemu_log("Unknown QEMU_IFLA_INFO_KIND %s\n", li_context->name); qemu_log_mask(LOG_UNIMP, "Unknown QEMU_IFLA_INFO_KIND %s\n",
li_context->name);
} }
break; break;
case QEMU_IFLA_INFO_SLAVE_DATA: case QEMU_IFLA_INFO_SLAVE_DATA:
@ -663,12 +667,13 @@ static abi_long host_to_target_data_linkinfo_nlattr(struct nlattr *nlattr,
NULL, NULL,
host_to_target_slave_data_bridge_nlattr); host_to_target_slave_data_bridge_nlattr);
} else { } else {
gemu_log("Unknown QEMU_IFLA_INFO_SLAVE_KIND %s\n", qemu_log_mask(LOG_UNIMP, "Unknown QEMU_IFLA_INFO_SLAVE_KIND %s\n",
li_context->slave_name); li_context->slave_name);
} }
break; break;
default: default:
gemu_log("Unknown host QEMU_IFLA_INFO type: %d\n", nlattr->nla_type); qemu_log_mask(LOG_UNIMP, "Unknown host QEMU_IFLA_INFO type: %d\n",
nlattr->nla_type);
break; break;
} }
@ -690,7 +695,8 @@ static abi_long host_to_target_data_inet_nlattr(struct nlattr *nlattr,
} }
break; break;
default: default:
gemu_log("Unknown host AF_INET type: %d\n", nlattr->nla_type); qemu_log_mask(LOG_UNIMP, "Unknown host AF_INET type: %d\n",
nlattr->nla_type);
} }
return 0; return 0;
} }
@ -741,7 +747,8 @@ static abi_long host_to_target_data_inet6_nlattr(struct nlattr *nlattr,
} }
break; break;
default: default:
gemu_log("Unknown host AF_INET6 type: %d\n", nlattr->nla_type); qemu_log_mask(LOG_UNIMP, "Unknown host AF_INET6 type: %d\n",
nlattr->nla_type);
} }
return 0; return 0;
} }
@ -759,7 +766,8 @@ static abi_long host_to_target_data_spec_nlattr(struct nlattr *nlattr,
NULL, NULL,
host_to_target_data_inet6_nlattr); host_to_target_data_inet6_nlattr);
default: default:
gemu_log("Unknown host AF_SPEC type: %d\n", nlattr->nla_type); qemu_log_mask(LOG_UNIMP, "Unknown host AF_SPEC type: %d\n",
nlattr->nla_type);
break; break;
} }
return 0; return 0;
@ -780,7 +788,8 @@ static abi_long host_to_target_data_xdp_nlattr(struct nlattr *nlattr,
*u32 = tswap32(*u32); *u32 = tswap32(*u32);
break; break;
default: default:
gemu_log("Unknown host XDP type: %d\n", nlattr->nla_type); qemu_log_mask(
LOG_UNIMP, "Unknown host XDP type: %d\n", nlattr->nla_type);
break; break;
} }
return 0; return 0;
@ -920,7 +929,8 @@ static abi_long host_to_target_data_link_rtattr(struct rtattr *rtattr)
NULL, NULL,
host_to_target_data_xdp_nlattr); host_to_target_data_xdp_nlattr);
default: default:
gemu_log("Unknown host QEMU_IFLA type: %d\n", rtattr->rta_type); qemu_log_mask(LOG_UNIMP, "Unknown host QEMU_IFLA type: %d\n",
rtattr->rta_type);
break; break;
} }
return 0; return 0;
@ -954,7 +964,8 @@ static abi_long host_to_target_data_addr_rtattr(struct rtattr *rtattr)
ci->tstamp = tswap32(ci->tstamp); ci->tstamp = tswap32(ci->tstamp);
break; break;
default: default:
gemu_log("Unknown host IFA type: %d\n", rtattr->rta_type); qemu_log_mask(
LOG_UNIMP, "Unknown host IFA type: %d\n", rtattr->rta_type);
break; break;
} }
return 0; return 0;
@ -996,7 +1007,8 @@ static abi_long host_to_target_data_route_rtattr(struct rtattr *rtattr)
#endif #endif
break; break;
default: default:
gemu_log("Unknown host RTA type: %d\n", rtattr->rta_type); qemu_log_mask(
LOG_UNIMP, "Unknown host RTA type: %d\n", rtattr->rta_type);
break; break;
} }
return 0; return 0;
@ -1111,7 +1123,8 @@ static abi_long target_to_host_data_link_rtattr(struct rtattr *rtattr)
{ {
switch (rtattr->rta_type) { switch (rtattr->rta_type) {
default: default:
gemu_log("Unknown target QEMU_IFLA type: %d\n", rtattr->rta_type); qemu_log_mask(LOG_UNIMP, "Unknown target QEMU_IFLA type: %d\n",
rtattr->rta_type);
break; break;
} }
return 0; return 0;
@ -1125,7 +1138,8 @@ static abi_long target_to_host_data_addr_rtattr(struct rtattr *rtattr)
case IFA_ADDRESS: case IFA_ADDRESS:
break; break;
default: default:
gemu_log("Unknown target IFA type: %d\n", rtattr->rta_type); qemu_log_mask(LOG_UNIMP, "Unknown target IFA type: %d\n",
rtattr->rta_type);
break; break;
} }
return 0; return 0;
@ -1147,7 +1161,8 @@ static abi_long target_to_host_data_route_rtattr(struct rtattr *rtattr)
*u32 = tswap32(*u32); *u32 = tswap32(*u32);
break; break;
default: default:
gemu_log("Unknown target RTA type: %d\n", rtattr->rta_type); qemu_log_mask(LOG_UNIMP, "Unknown target RTA type: %d\n",
rtattr->rta_type);
break; break;
} }
return 0; return 0;
@ -1232,8 +1247,8 @@ static abi_long host_to_target_data_audit(struct nlmsghdr *nlh)
{ {
switch (nlh->nlmsg_type) { switch (nlh->nlmsg_type) {
default: default:
gemu_log("Unknown host audit message type %d\n", qemu_log_mask(LOG_UNIMP, "Unknown host audit message type %d\n",
nlh->nlmsg_type); nlh->nlmsg_type);
return -TARGET_EINVAL; return -TARGET_EINVAL;
} }
return 0; return 0;
@ -1253,8 +1268,8 @@ static abi_long target_to_host_data_audit(struct nlmsghdr *nlh)
case AUDIT_FIRST_USER_MSG2 ... AUDIT_LAST_USER_MSG2: case AUDIT_FIRST_USER_MSG2 ... AUDIT_LAST_USER_MSG2:
break; break;
default: default:
gemu_log("Unknown target audit message type %d\n", qemu_log_mask(LOG_UNIMP, "Unknown target audit message type %d\n",
nlh->nlmsg_type); nlh->nlmsg_type);
return -TARGET_EINVAL; return -TARGET_EINVAL;
} }

35
linux-user/syscall.c
View File

@ -1563,7 +1563,11 @@ static inline abi_long target_to_host_cmsg(struct msghdr *msgh,
* something more intelligent than "twice the size of the * something more intelligent than "twice the size of the
* target buffer we're reading from". * target buffer we're reading from".
*/ */
gemu_log("Host cmsg overflow\n"); qemu_log_mask(LOG_UNIMP,
("Unsupported ancillary data %d/%d: "
"unhandled msg size\n"),
tswap32(target_cmsg->cmsg_level),
tswap32(target_cmsg->cmsg_type));
break; break;
} }
@ -1593,8 +1597,8 @@ static inline abi_long target_to_host_cmsg(struct msghdr *msgh,
__get_user(cred->uid, &target_cred->uid); __get_user(cred->uid, &target_cred->uid);
__get_user(cred->gid, &target_cred->gid); __get_user(cred->gid, &target_cred->gid);
} else { } else {
gemu_log("Unsupported ancillary data: %d/%d\n", qemu_log_mask(LOG_UNIMP, "Unsupported ancillary data: %d/%d\n",
cmsg->cmsg_level, cmsg->cmsg_type); cmsg->cmsg_level, cmsg->cmsg_type);
memcpy(data, target_data, len); memcpy(data, target_data, len);
} }
@ -1815,8 +1819,8 @@ static inline abi_long host_to_target_cmsg(struct target_msghdr *target_msgh,
default: default:
unimplemented: unimplemented:
gemu_log("Unsupported ancillary data: %d/%d\n", qemu_log_mask(LOG_UNIMP, "Unsupported ancillary data: %d/%d\n",
cmsg->cmsg_level, cmsg->cmsg_type); cmsg->cmsg_level, cmsg->cmsg_type);
memcpy(target_data, data, MIN(len, tgt_len)); memcpy(target_data, data, MIN(len, tgt_len));
if (tgt_len > len) { if (tgt_len > len) {
memset(target_data + len, 0, tgt_len - len); memset(target_data + len, 0, tgt_len - len);
@ -2291,7 +2295,8 @@ set_timeout:
#endif /* SOL_NETLINK */ #endif /* SOL_NETLINK */
default: default:
unimplemented: unimplemented:
gemu_log("Unsupported setsockopt level=%d optname=%d\n", level, optname); qemu_log_mask(LOG_UNIMP, "Unsupported setsockopt level=%d optname=%d\n",
level, optname);
ret = -TARGET_ENOPROTOOPT; ret = -TARGET_ENOPROTOOPT;
} }
return ret; return ret;
@ -2698,8 +2703,9 @@ get_timeout:
#endif /* SOL_NETLINK */ #endif /* SOL_NETLINK */
default: default:
unimplemented: unimplemented:
gemu_log("getsockopt level=%d optname=%d not yet supported\n", qemu_log_mask(LOG_UNIMP,
level, optname); "getsockopt level=%d optname=%d not yet supported\n",
level, optname);
ret = -TARGET_EOPNOTSUPP; ret = -TARGET_EOPNOTSUPP;
break; break;
} }
@ -3454,7 +3460,7 @@ static abi_long do_socketcall(int num, abi_ulong vptr)
case TARGET_SYS_SENDMMSG: /* sockfd, msgvec, vlen, flags */ case TARGET_SYS_SENDMMSG: /* sockfd, msgvec, vlen, flags */
return do_sendrecvmmsg(a[0], a[1], a[2], a[3], 1); return do_sendrecvmmsg(a[0], a[1], a[2], a[3], 1);
default: default:
gemu_log("Unsupported socketcall: %d\n", num); qemu_log_mask(LOG_UNIMP, "Unsupported socketcall: %d\n", num);
return -TARGET_EINVAL; return -TARGET_EINVAL;
} }
} }
@ -4365,7 +4371,8 @@ static abi_long do_ipc(CPUArchState *cpu_env,
ret = do_shmctl(first, second, ptr); ret = do_shmctl(first, second, ptr);
break; break;
default: default:
gemu_log("Unsupported ipc call: %d (version %d)\n", call, version); qemu_log_mask(LOG_UNIMP, "Unsupported ipc call: %d (version %d)\n",
call, version);
ret = -TARGET_ENOSYS; ret = -TARGET_ENOSYS;
break; break;
} }
@ -5213,7 +5220,8 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg)
ie = ioctl_entries; ie = ioctl_entries;
for(;;) { for(;;) {
if (ie->target_cmd == 0) { if (ie->target_cmd == 0) {
gemu_log("Unsupported ioctl: cmd=0x%04lx\n", (long)cmd); qemu_log_mask(
LOG_UNIMP, "Unsupported ioctl: cmd=0x%04lx\n", (long)cmd);
return -TARGET_ENOSYS; return -TARGET_ENOSYS;
} }
if (ie->target_cmd == cmd) if (ie->target_cmd == cmd)
@ -5281,8 +5289,9 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg)
} }
break; break;
default: default:
gemu_log("Unsupported ioctl type: cmd=0x%04lx type=%d\n", qemu_log_mask(LOG_UNIMP,
(long)cmd, arg_type[0]); "Unsupported ioctl type: cmd=0x%04lx type=%d\n",
(long)cmd, arg_type[0]);
ret = -TARGET_ENOSYS; ret = -TARGET_ENOSYS;
break; break;
} }

3
linux-user/vm86.c
View File

@ -402,7 +402,8 @@ int do_vm86(CPUX86State *env, long subfunction, abi_ulong vm86_addr)
case TARGET_VM86_FREE_IRQ: case TARGET_VM86_FREE_IRQ:
case TARGET_VM86_GET_IRQ_BITS: case TARGET_VM86_GET_IRQ_BITS:
case TARGET_VM86_GET_AND_RESET_IRQ: case TARGET_VM86_GET_AND_RESET_IRQ:
gemu_log("qemu: unsupported vm86 subfunction (%ld)\n", subfunction); qemu_log_mask(LOG_UNIMP, "qemu: unsupported vm86 subfunction (%ld)\n",
subfunction);
ret = -TARGET_EINVAL; ret = -TARGET_EINVAL;
goto out; goto out;
case TARGET_VM86_PLUS_INSTALL_CHECK: case TARGET_VM86_PLUS_INSTALL_CHECK: