* [PATCH] linux-user/sh4/termbits: Silence warning about TIOCSER_TEMT double definition
@ 2022-03-30 13:43 Thomas Huth
2022-03-30 13:54 ` Richard Henderson
` (5 more replies)
0 siblings, 6 replies; 9+ messages in thread
From: Thomas Huth @ 2022-03-30 13:43 UTC (permalink / raw)
To: qemu-devel, Laurent Vivier; +Cc: qemu-trivial, Magnus Damm, Yoshinori Sato
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
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH] linux-user/sh4/termbits: Silence warning about TIOCSER_TEMT double definition
2022-03-30 13:43 [PATCH] linux-user/sh4/termbits: Silence warning about TIOCSER_TEMT double definition Thomas Huth
@ 2022-03-30 13:54 ` Richard Henderson
2022-03-30 14:13 ` Philippe Mathieu-Daudé
` (4 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Richard Henderson @ 2022-03-30 13:54 UTC (permalink / raw)
To: Thomas Huth, qemu-devel, Laurent Vivier
Cc: qemu-trivial, Magnus Damm, Yoshinori Sato
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~
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] linux-user/sh4/termbits: Silence warning about TIOCSER_TEMT double definition
2022-03-30 13:43 [PATCH] linux-user/sh4/termbits: Silence warning about TIOCSER_TEMT double definition Thomas Huth
2022-03-30 13:54 ` Richard Henderson
@ 2022-03-30 14:13 ` Philippe Mathieu-Daudé
2022-03-30 14:37 ` Laurent Vivier
` (3 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Philippe Mathieu-Daudé @ 2022-03-30 14:13 UTC (permalink / raw)
To: Thomas Huth, qemu-devel, Laurent Vivier
Cc: qemu-trivial, Magnus Damm, Yoshinori Sato
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>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] linux-user/sh4/termbits: Silence warning about TIOCSER_TEMT double definition
2022-03-30 13:43 [PATCH] linux-user/sh4/termbits: Silence warning about TIOCSER_TEMT double definition Thomas Huth
2022-03-30 13:54 ` Richard Henderson
2022-03-30 14:13 ` Philippe Mathieu-Daudé
@ 2022-03-30 14:37 ` Laurent Vivier
2022-03-31 13:25 ` Yoshinori Sato
` (2 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Laurent Vivier @ 2022-03-30 14:37 UTC (permalink / raw)
To: Thomas Huth, qemu-devel; +Cc: qemu-trivial, Magnus Damm, Yoshinori Sato
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>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] linux-user/sh4/termbits: Silence warning about TIOCSER_TEMT double definition
2022-03-30 13:43 [PATCH] linux-user/sh4/termbits: Silence warning about TIOCSER_TEMT double definition Thomas Huth
` (2 preceding siblings ...)
2022-03-30 14:37 ` Laurent Vivier
@ 2022-03-31 13:25 ` Yoshinori Sato
2022-03-31 16:22 ` Laurent Vivier
2022-03-31 19:28 ` Laurent Vivier
5 siblings, 0 replies; 9+ messages in thread
From: Yoshinori Sato @ 2022-03-31 13:25 UTC (permalink / raw)
To: Thomas Huth; +Cc: qemu-trivial, Magnus Damm, qemu-devel, Laurent Vivier
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
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] linux-user/sh4/termbits: Silence warning about TIOCSER_TEMT double definition
2022-03-30 13:43 [PATCH] linux-user/sh4/termbits: Silence warning about TIOCSER_TEMT double definition Thomas Huth
` (3 preceding siblings ...)
2022-03-31 13:25 ` Yoshinori Sato
@ 2022-03-31 16:22 ` Laurent Vivier
2022-03-31 17:31 ` Richard Henderson
2022-03-31 19:28 ` Laurent Vivier
5 siblings, 1 reply; 9+ messages in thread
From: Laurent Vivier @ 2022-03-31 16:22 UTC (permalink / raw)
To: Thomas Huth, qemu-devel; +Cc: qemu-trivial, Magnus Damm, Yoshinori Sato
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
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] linux-user/sh4/termbits: Silence warning about TIOCSER_TEMT double definition
2022-03-31 16:22 ` Laurent Vivier
@ 2022-03-31 17:31 ` Richard Henderson
2022-04-01 6:13 ` Thomas Huth
0 siblings, 1 reply; 9+ messages in thread
From: Richard Henderson @ 2022-03-31 17:31 UTC (permalink / raw)
To: Laurent Vivier, Thomas Huth, qemu-devel
Cc: qemu-trivial, Magnus Damm, Yoshinori Sato
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~
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] linux-user/sh4/termbits: Silence warning about TIOCSER_TEMT double definition
2022-03-30 13:43 [PATCH] linux-user/sh4/termbits: Silence warning about TIOCSER_TEMT double definition Thomas Huth
` (4 preceding siblings ...)
2022-03-31 16:22 ` Laurent Vivier
@ 2022-03-31 19:28 ` Laurent Vivier
5 siblings, 0 replies; 9+ messages in thread
From: Laurent Vivier @ 2022-03-31 19:28 UTC (permalink / raw)
To: Thomas Huth, qemu-devel; +Cc: qemu-trivial, Magnus Damm, Yoshinori Sato
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
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] linux-user/sh4/termbits: Silence warning about TIOCSER_TEMT double definition
2022-03-31 17:31 ` Richard Henderson
@ 2022-04-01 6:13 ` Thomas Huth
0 siblings, 0 replies; 9+ messages in thread
From: Thomas Huth @ 2022-04-01 6:13 UTC (permalink / raw)
To: Richard Henderson, Laurent Vivier, qemu-devel
Cc: qemu-trivial, Magnus Damm, Yoshinori Sato
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
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2022-04-01 6:18 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-30 13:43 [PATCH] linux-user/sh4/termbits: Silence warning about TIOCSER_TEMT double definition Thomas Huth
2022-03-30 13:54 ` Richard Henderson
2022-03-30 14:13 ` Philippe Mathieu-Daudé
2022-03-30 14:37 ` Laurent Vivier
2022-03-31 13:25 ` Yoshinori Sato
2022-03-31 16:22 ` Laurent Vivier
2022-03-31 17:31 ` Richard Henderson
2022-04-01 6:13 ` Thomas Huth
2022-03-31 19:28 ` Laurent Vivier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).