linux(4): Disambiguate identical ioctl errors in distinct paths

And stop truncating the full ioctl number in the error message.

Reviewed by:	emaste
Differential Revision:	https://reviews.freebsd.org/D27048
This commit is contained in:
Conrad Meyer 2020-11-02 06:16:11 +00:00
parent 06c888ecb9
commit 63ed2e3642

View File

@ -275,8 +275,8 @@ linux_ioctl_hdio(struct thread *td, struct linux_ioctl_args *args)
default:
/* XXX */
linux_msg(td,
"ioctl fd=%d, cmd=0x%x ('%c',%d) is not implemented",
args->fd, (int)(args->cmd & 0xffff),
"%s fd=%d, cmd=0x%x ('%c',%d) is not implemented",
__func__, args->fd, args->cmd,
(int)(args->cmd & 0xff00) >> 8,
(int)(args->cmd & 0xff));
break;
@ -3670,8 +3670,8 @@ linux_ioctl_fallback(struct thread *td, struct linux_ioctl_args *args)
return (ENOTSUP);
default:
linux_msg(td, "ioctl fd=%d, cmd=0x%x ('%c',%d) is not implemented",
args->fd, (int)(args->cmd & 0xffff),
linux_msg(td, "%s fd=%d, cmd=0x%x ('%c',%d) is not implemented",
__func__, args->fd, args->cmd,
(int)(args->cmd & 0xff00) >> 8, (int)(args->cmd & 0xff));
break;
}