diff mbox

[5/7] TIOCGPTN and related terminal control ioctls were not converted to the guest ioctl format on x86_64 targets. Convert these ioctls to enable terminal functionality on x86_64 guests.

Message ID 1902090116.1359464.1466295335501.JavaMail.zimbra@raptorengineeringinc.com (mailing list archive)
State New, archived
Headers show

Commit Message

Timothy Pearson June 19, 2016, 12:15 a.m. UTC
Signed-off-by: Timothy Pearson <tpearson@raptorengineering.com>
---
 linux-user/x86_64/termbits.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Comments

Peter Maydell June 19, 2016, 9:59 a.m. UTC | #1
On 19 June 2016 at 01:15, Timothy Pearson
<tpearson@raptorengineering.com> wrote:
> Signed-off-by: Timothy Pearson <tpearson@raptorengineering.com>
> ---
>  linux-user/x86_64/termbits.h | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/linux-user/x86_64/termbits.h b/linux-user/x86_64/termbits.h
> index 1c3445c..5fc4639 100644
> --- a/linux-user/x86_64/termbits.h
> +++ b/linux-user/x86_64/termbits.h
> @@ -209,12 +209,12 @@ struct target_termios {
>  #define TARGET_TIOCSBRK        0x5427  /* BSD compatibility */
>  #define TARGET_TIOCCBRK        0x5428  /* BSD compatibility */
>  #define TARGET_TIOCGSID        0x5429  /* Return the session ID of FD */
> -#define TARGET_TCGETS2         _IOR('T',0x2A, struct termios2)
> -#define TARGET_TCSETS2         _IOW('T',0x2B, struct termios2)
> -#define TARGET_TCSETSW2        _IOW('T',0x2C, struct termios2)
> -#define TARGET_TCSETSF2        _IOW('T',0x2D, struct termios2)
> -#define TARGET_TIOCGPTN        _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
> -#define TARGET_TIOCSPTLCK      _IOW('T',0x31, int)  /* Lock/unlock Pty */
> +#define TARGET_TCGETS2         TARGET_IOR('T',0x2A, struct termios2)
> +#define TARGET_TCSETS2         TARGET_IOW('T',0x2B, struct termios2)
> +#define TARGET_TCSETSW2                TARGET_IOW('T',0x2C, struct termios2)
> +#define TARGET_TCSETSF2                TARGET_IOW('T',0x2D, struct termios2)
> +#define TARGET_TIOCGPTN                TARGET_IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
> +#define TARGET_TIOCSPTLCK      TARGET_IOW('T',0x31, int)  /* Lock/unlock Pty */
>
>  #define TARGET_FIONCLEX        0x5450  /* these numbers need to be adjusted. */
>  #define TARGET_FIOCLEX         0x5451

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

(though the spacing looks a little odd -- make sure you're
using spaces only and run through scripts/checkpatch.pl.)

thanks
-- PMM
diff mbox

Patch

diff --git a/linux-user/x86_64/termbits.h b/linux-user/x86_64/termbits.h
index 1c3445c..5fc4639 100644
--- a/linux-user/x86_64/termbits.h
+++ b/linux-user/x86_64/termbits.h
@@ -209,12 +209,12 @@  struct target_termios {
 #define TARGET_TIOCSBRK	0x5427  /* BSD compatibility */
 #define TARGET_TIOCCBRK	0x5428  /* BSD compatibility */
 #define TARGET_TIOCGSID	0x5429  /* Return the session ID of FD */
-#define TARGET_TCGETS2		_IOR('T',0x2A, struct termios2)
-#define TARGET_TCSETS2		_IOW('T',0x2B, struct termios2)
-#define TARGET_TCSETSW2	_IOW('T',0x2C, struct termios2)
-#define TARGET_TCSETSF2	_IOW('T',0x2D, struct termios2)
-#define TARGET_TIOCGPTN	_IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
-#define TARGET_TIOCSPTLCK	_IOW('T',0x31, int)  /* Lock/unlock Pty */
+#define TARGET_TCGETS2		TARGET_IOR('T',0x2A, struct termios2)
+#define TARGET_TCSETS2		TARGET_IOW('T',0x2B, struct termios2)
+#define TARGET_TCSETSW2		TARGET_IOW('T',0x2C, struct termios2)
+#define TARGET_TCSETSF2		TARGET_IOW('T',0x2D, struct termios2)
+#define TARGET_TIOCGPTN		TARGET_IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
+#define TARGET_TIOCSPTLCK	TARGET_IOW('T',0x31, int)  /* Lock/unlock Pty */
 
 #define TARGET_FIONCLEX	0x5450  /* these numbers need to be adjusted. */
 #define TARGET_FIOCLEX		0x5451