1. Patchew
  2. QEMU
  3. View series

[PATCH] linux-user/sh4/termbits: Silence warning about TIOCSER_TEMT double definition

Thomas Huth posted 1 patch 3 years, 10 months ago
Test checkpatch passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20220330134302.979686-1-thuth@redhat.com
Maintainers: Laurent Vivier <laurent@vivier.eu>
linux-user/sh4/termbits.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[PATCH] linux-user/sh4/termbits: Silence warning about TIOCSER_TEMT double definition
Posted by Thomas Huth 3 years, 10 months ago 
Seen while compiling on Alpine:

 In file included from ../linux-user/strace.c:17:
 In file included from ../linux-user/qemu.h:11:
 In file included from ../linux-user/syscall_defs.h:1247:
 ../linux-user/sh4/termbits.h:276:10: warning: 'TIOCSER_TEMT' macro redefined
  [-Wmacro-redefined]
 # define TIOCSER_TEMT    0x01   /* Transmitter physically empty */
          ^
 /usr/include/sys/ioctl.h:50:9: note: previous definition is here
 #define TIOCSER_TEMT 1
         ^
 1 warning generated.

Add the TARGET_ prefix here, too, like we do it on the other architectures.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 linux-user/sh4/termbits.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linux-user/sh4/termbits.h b/linux-user/sh4/termbits.h
index f91b5c51cf..eeabd2d7a9 100644
--- a/linux-user/sh4/termbits.h
+++ b/linux-user/sh4/termbits.h
@@ -273,7 +273,7 @@ ebugging only */
 #define TARGET_TIOCSERGETLSR   TARGET_IOR('T', 89, unsigned int) /* 0x5459 */ /* Get line sta
 tus register */
   /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
-# define TIOCSER_TEMT    0x01   /* Transmitter physically empty */
+# define TARGET_TIOCSER_TEMT   0x01   /* Transmitter physically empty */
 #define TARGET_TIOCSERGETMULTI TARGET_IOR('T', 90, int) /* 0x545A
 */ /* Get multiport config  */
 #define TARGET_TIOCSERSETMULTI TARGET_IOW('T', 91, int) /* 0x545B
-- 
2.27.0
Re: [PATCH] linux-user/sh4/termbits: Silence warning about TIOCSER_TEMT double definition
Posted by Laurent Vivier 3 years, 10 months ago 
Le 30/03/2022 à 15:43, Thomas Huth a écrit :
> Seen while compiling on Alpine:
> 
>   In file included from ../linux-user/strace.c:17:
>   In file included from ../linux-user/qemu.h:11:
>   In file included from ../linux-user/syscall_defs.h:1247:
>   ../linux-user/sh4/termbits.h:276:10: warning: 'TIOCSER_TEMT' macro redefined
>    [-Wmacro-redefined]
>   # define TIOCSER_TEMT    0x01   /* Transmitter physically empty */
>            ^
>   /usr/include/sys/ioctl.h:50:9: note: previous definition is here
>   #define TIOCSER_TEMT 1
>           ^
>   1 warning generated.
> 
> Add the TARGET_ prefix here, too, like we do it on the other architectures.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   linux-user/sh4/termbits.h | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)

Thomas,

do you think it can wait 7.1?

Thanks,
Laurent
Re: [PATCH] linux-user/sh4/termbits: Silence warning about TIOCSER_TEMT double definition
Posted by Richard Henderson 3 years, 10 months ago 
On 3/31/22 10:22, Laurent Vivier wrote:
> Le 30/03/2022 à 15:43, Thomas Huth a écrit :
>> Seen while compiling on Alpine:
>>
>>   In file included from ../linux-user/strace.c:17:
>>   In file included from ../linux-user/qemu.h:11:
>>   In file included from ../linux-user/syscall_defs.h:1247:
>>   ../linux-user/sh4/termbits.h:276:10: warning: 'TIOCSER_TEMT' macro redefined
>>    [-Wmacro-redefined]
>>   # define TIOCSER_TEMT    0x01   /* Transmitter physically empty */
>>            ^
>>   /usr/include/sys/ioctl.h:50:9: note: previous definition is here
>>   #define TIOCSER_TEMT 1
>>           ^
>>   1 warning generated.
>>
>> Add the TARGET_ prefix here, too, like we do it on the other architectures.
>>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>>   linux-user/sh4/termbits.h | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Thomas,
> 
> do you think it can wait 7.1?

It fixes a build problem, so I'd suggest putting it in for 7.0.


r~
Re: [PATCH] linux-user/sh4/termbits: Silence warning about TIOCSER_TEMT double definition
Posted by Thomas Huth 3 years, 10 months ago 
On 31/03/2022 19.31, Richard Henderson wrote:
> On 3/31/22 10:22, Laurent Vivier wrote:
>> Le 30/03/2022 à 15:43, Thomas Huth a écrit :
>>> Seen while compiling on Alpine:
>>>
>>>   In file included from ../linux-user/strace.c:17:
>>>   In file included from ../linux-user/qemu.h:11:
>>>   In file included from ../linux-user/syscall_defs.h:1247:
>>>   ../linux-user/sh4/termbits.h:276:10: warning: 'TIOCSER_TEMT' macro 
>>> redefined
>>>    [-Wmacro-redefined]
>>>   # define TIOCSER_TEMT    0x01   /* Transmitter physically empty */
>>>            ^
>>>   /usr/include/sys/ioctl.h:50:9: note: previous definition is here
>>>   #define TIOCSER_TEMT 1
>>>           ^
>>>   1 warning generated.
>>>
>>> Add the TARGET_ prefix here, too, like we do it on the other architectures.
>>>
>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>>> ---
>>>   linux-user/sh4/termbits.h | 2 +-
>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> Thomas,
>>
>> do you think it can wait 7.1?
> 
> It fixes a build problem, so I'd suggest putting it in for 7.0.

It's just a warning, so unless the user compiles with --enable-werror, it 
should be harmless. Anyway, I see that Laurent already picked it up (thanks!).

  Thomas
Re: [PATCH] linux-user/sh4/termbits: Silence warning about TIOCSER_TEMT double definition
Posted by Laurent Vivier 3 years, 10 months ago 
Le 30/03/2022 à 15:43, Thomas Huth a écrit :
> Seen while compiling on Alpine:
> 
>   In file included from ../linux-user/strace.c:17:
>   In file included from ../linux-user/qemu.h:11:
>   In file included from ../linux-user/syscall_defs.h:1247:
>   ../linux-user/sh4/termbits.h:276:10: warning: 'TIOCSER_TEMT' macro redefined
>    [-Wmacro-redefined]
>   # define TIOCSER_TEMT    0x01   /* Transmitter physically empty */
>            ^
>   /usr/include/sys/ioctl.h:50:9: note: previous definition is here
>   #define TIOCSER_TEMT 1
>           ^
>   1 warning generated.
> 
> Add the TARGET_ prefix here, too, like we do it on the other architectures.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   linux-user/sh4/termbits.h | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/linux-user/sh4/termbits.h b/linux-user/sh4/termbits.h
> index f91b5c51cf..eeabd2d7a9 100644
> --- a/linux-user/sh4/termbits.h
> +++ b/linux-user/sh4/termbits.h
> @@ -273,7 +273,7 @@ ebugging only */
>   #define TARGET_TIOCSERGETLSR   TARGET_IOR('T', 89, unsigned int) /* 0x5459 */ /* Get line sta
>   tus register */
>     /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
> -# define TIOCSER_TEMT    0x01   /* Transmitter physically empty */
> +# define TARGET_TIOCSER_TEMT   0x01   /* Transmitter physically empty */
>   #define TARGET_TIOCSERGETMULTI TARGET_IOR('T', 90, int) /* 0x545A
>   */ /* Get multiport config  */
>   #define TARGET_TIOCSERSETMULTI TARGET_IOW('T', 91, int) /* 0x545B

Applied to my trivial-patches branch.

Thanks,
Laurent
Re: [PATCH] linux-user/sh4/termbits: Silence warning about TIOCSER_TEMT double definition
Posted by Yoshinori Sato 3 years, 10 months ago 
On Wed, 30 Mar 2022 22:43:02 +0900,
Thomas Huth wrote:
> 
> Seen while compiling on Alpine:
> 
>  In file included from ../linux-user/strace.c:17:
>  In file included from ../linux-user/qemu.h:11:
>  In file included from ../linux-user/syscall_defs.h:1247:
>  ../linux-user/sh4/termbits.h:276:10: warning: 'TIOCSER_TEMT' macro redefined
>   [-Wmacro-redefined]
>  # define TIOCSER_TEMT    0x01   /* Transmitter physically empty */
>           ^
>  /usr/include/sys/ioctl.h:50:9: note: previous definition is here
>  #define TIOCSER_TEMT 1
>          ^
>  1 warning generated.
> 
> Add the TARGET_ prefix here, too, like we do it on the other architectures.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  linux-user/sh4/termbits.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/linux-user/sh4/termbits.h b/linux-user/sh4/termbits.h
> index f91b5c51cf..eeabd2d7a9 100644
> --- a/linux-user/sh4/termbits.h
> +++ b/linux-user/sh4/termbits.h
> @@ -273,7 +273,7 @@ ebugging only */
>  #define TARGET_TIOCSERGETLSR   TARGET_IOR('T', 89, unsigned int) /* 0x5459 */ /* Get line sta
>  tus register */
>    /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
> -# define TIOCSER_TEMT    0x01   /* Transmitter physically empty */
> +# define TARGET_TIOCSER_TEMT   0x01   /* Transmitter physically empty */
>  #define TARGET_TIOCSERGETMULTI TARGET_IOR('T', 90, int) /* 0x545A
>  */ /* Get multiport config  */
>  #define TARGET_TIOCSERSETMULTI TARGET_IOW('T', 91, int) /* 0x545B
> -- 
> 2.27.0
> 

Reviewed-by: Yoshinori Sato <ysato@users.sourceforge.jp>

-- 
Yosinori Sato
Re: [PATCH] linux-user/sh4/termbits: Silence warning about TIOCSER_TEMT double definition
Posted by Laurent Vivier 3 years, 10 months ago 
Le 30/03/2022 à 15:43, Thomas Huth a écrit :
> Seen while compiling on Alpine:
> 
>   In file included from ../linux-user/strace.c:17:
>   In file included from ../linux-user/qemu.h:11:
>   In file included from ../linux-user/syscall_defs.h:1247:
>   ../linux-user/sh4/termbits.h:276:10: warning: 'TIOCSER_TEMT' macro redefined
>    [-Wmacro-redefined]
>   # define TIOCSER_TEMT    0x01   /* Transmitter physically empty */
>            ^
>   /usr/include/sys/ioctl.h:50:9: note: previous definition is here
>   #define TIOCSER_TEMT 1
>           ^
>   1 warning generated.
> 
> Add the TARGET_ prefix here, too, like we do it on the other architectures.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   linux-user/sh4/termbits.h | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/linux-user/sh4/termbits.h b/linux-user/sh4/termbits.h
> index f91b5c51cf..eeabd2d7a9 100644
> --- a/linux-user/sh4/termbits.h
> +++ b/linux-user/sh4/termbits.h
> @@ -273,7 +273,7 @@ ebugging only */
>   #define TARGET_TIOCSERGETLSR   TARGET_IOR('T', 89, unsigned int) /* 0x5459 */ /* Get line sta
>   tus register */
>     /* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
> -# define TIOCSER_TEMT    0x01   /* Transmitter physically empty */
> +# define TARGET_TIOCSER_TEMT   0x01   /* Transmitter physically empty */
>   #define TARGET_TIOCSERGETMULTI TARGET_IOR('T', 90, int) /* 0x545A
>   */ /* Get multiport config  */
>   #define TARGET_TIOCSERSETMULTI TARGET_IOW('T', 91, int) /* 0x545B

Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Re: [PATCH] linux-user/sh4/termbits: Silence warning about TIOCSER_TEMT double definition
Posted by Philippe Mathieu-Daudé 3 years, 10 months ago 
On 30/3/22 15:43, Thomas Huth wrote:
> Seen while compiling on Alpine:
> 
>   In file included from ../linux-user/strace.c:17:
>   In file included from ../linux-user/qemu.h:11:
>   In file included from ../linux-user/syscall_defs.h:1247:
>   ../linux-user/sh4/termbits.h:276:10: warning: 'TIOCSER_TEMT' macro redefined
>    [-Wmacro-redefined]
>   # define TIOCSER_TEMT    0x01   /* Transmitter physically empty */
>            ^
>   /usr/include/sys/ioctl.h:50:9: note: previous definition is here
>   #define TIOCSER_TEMT 1
>           ^
>   1 warning generated.
> 
> Add the TARGET_ prefix here, too, like we do it on the other architectures.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   linux-user/sh4/termbits.h | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Re: [PATCH] linux-user/sh4/termbits: Silence warning about TIOCSER_TEMT double definition
Posted by Richard Henderson 3 years, 10 months ago 
On 3/30/22 07:43, Thomas Huth wrote:
> Seen while compiling on Alpine:
> 
>   In file included from ../linux-user/strace.c:17:
>   In file included from ../linux-user/qemu.h:11:
>   In file included from ../linux-user/syscall_defs.h:1247:
>   ../linux-user/sh4/termbits.h:276:10: warning: 'TIOCSER_TEMT' macro redefined
>    [-Wmacro-redefined]
>   # define TIOCSER_TEMT    0x01   /* Transmitter physically empty */
>            ^
>   /usr/include/sys/ioctl.h:50:9: note: previous definition is here
>   #define TIOCSER_TEMT 1
>           ^
>   1 warning generated.
> 
> Add the TARGET_ prefix here, too, like we do it on the other architectures.
> 
> Signed-off-by: Thomas Huth<thuth@redhat.com>
> ---
>   linux-user/sh4/termbits.h | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.