From: Helge Deller Date: Tue, 6 Dec 2016 15:24:03 +0000 (+0100) Subject: linux-user: Handle TIOCSTART and TIOCSTOP X-Git-Tag: v2.9.0-rc0~137^2~22 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8cb762fe013a4368fc7aa2eba27c44033ec310e0;p=thirdparty%2Fqemu.git linux-user: Handle TIOCSTART and TIOCSTOP Some architectures (ppc, alpha, sparc, parisc, sh and xtensa) define the BSD TIOCSTART and TIOCSTOP ioctls in their kernel headers to provide compatibility to other operating systems. Those ioctls are not implemented in Linux, nevertheless, bash will use this ioctl if it's available on those architectures. To avoid false warnings, add code to simply ignore those ioctls. Signed-off-by: Helge Deller Message-Id: <20161206152403.GA6651@ls3530> Signed-off-by: Richard Henderson --- diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h index 1bad701481a..eaf6fe61b07 100644 --- a/linux-user/ioctls.h +++ b/linux-user/ioctls.h @@ -422,3 +422,8 @@ MK_PTR(MK_STRUCT(STRUCT_rtentry))) IOCTL_SPECIAL(SIOCDELRT, IOC_W, do_ioctl_rt, MK_PTR(MK_STRUCT(STRUCT_rtentry))) + +#ifdef TARGET_TIOCSTART + IOCTL_IGNORE(TIOCSTART) + IOCTL_IGNORE(TIOCSTOP) +#endif diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 7b77503f94f..acb004f035c 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -5453,6 +5453,8 @@ static IOCTLEntry ioctl_entries[] = { { TARGET_ ## cmd, cmd, #cmd, access, 0, { __VA_ARGS__ } }, #define IOCTL_SPECIAL(cmd, access, dofn, ...) \ { TARGET_ ## cmd, cmd, #cmd, access, dofn, { __VA_ARGS__ } }, +#define IOCTL_IGNORE(cmd) \ + { TARGET_ ## cmd, 0, #cmd }, #include "ioctls.h" { 0, 0, }, }; @@ -5484,6 +5486,10 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg) #endif if (ie->do_ioctl) { return ie->do_ioctl(ie, buf_temp, fd, cmd, arg); + } else if (!ie->host_cmd) { + /* Some architectures define BSD ioctls in their headers + that are not implemented in Linux. */ + return -TARGET_ENOSYS; } switch(arg_type[0]) {