* [Qemu-devel] [PATCH] linux-user: Fix compilation when F_SETPIPE_SZ isn't defined
@ 2016-06-30 16:33 Peter Maydell
2016-06-30 17:51 ` Laurent Vivier
0 siblings, 1 reply; 3+ messages in thread
From: Peter Maydell @ 2016-06-30 16:33 UTC (permalink / raw)
To: qemu-devel; +Cc: patches, Riku Voipio
Older kernels don't have F_SETPIPE_SZ and F_GETPIPE_SZ (in
particular RHEL6's system headers don't define these). Add
ifdefs so that we can gracefully fall back to not supporting
those guest ioctls rather than failing to build.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
Reported by an anonymous IRC user...
linux-user/syscall.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 6ad8239..165fd06 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -5598,10 +5598,12 @@ static int target_to_host_fcntl_cmd(int cmd)
case TARGET_F_SETOWN_EX:
return F_SETOWN_EX;
#endif
+#ifdef F_SETPIPE_SZ
case TARGET_F_SETPIPE_SZ:
return F_SETPIPE_SZ;
case TARGET_F_GETPIPE_SZ:
return F_GETPIPE_SZ;
+#endif
default:
return -TARGET_EINVAL;
}
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH] linux-user: Fix compilation when F_SETPIPE_SZ isn't defined
2016-06-30 16:33 [Qemu-devel] [PATCH] linux-user: Fix compilation when F_SETPIPE_SZ isn't defined Peter Maydell
@ 2016-06-30 17:51 ` Laurent Vivier
2016-07-01 10:17 ` Peter Maydell
0 siblings, 1 reply; 3+ messages in thread
From: Laurent Vivier @ 2016-06-30 17:51 UTC (permalink / raw)
To: Peter Maydell, qemu-devel; +Cc: Riku Voipio, patches
Le 30/06/2016 à 18:33, Peter Maydell a écrit :
> Older kernels don't have F_SETPIPE_SZ and F_GETPIPE_SZ (in
> particular RHEL6's system headers don't define these). Add
> ifdefs so that we can gracefully fall back to not supporting
> those guest ioctls rather than failing to build.
>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
> ---
> Reported by an anonymous IRC user...
>
> linux-user/syscall.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index 6ad8239..165fd06 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -5598,10 +5598,12 @@ static int target_to_host_fcntl_cmd(int cmd)
> case TARGET_F_SETOWN_EX:
> return F_SETOWN_EX;
> #endif
> +#ifdef F_SETPIPE_SZ
> case TARGET_F_SETPIPE_SZ:
> return F_SETPIPE_SZ;
> case TARGET_F_GETPIPE_SZ:
> return F_GETPIPE_SZ;
> +#endif
> default:
> return -TARGET_EINVAL;
> }
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] linux-user: Fix compilation when F_SETPIPE_SZ isn't defined
2016-06-30 17:51 ` Laurent Vivier
@ 2016-07-01 10:17 ` Peter Maydell
0 siblings, 0 replies; 3+ messages in thread
From: Peter Maydell @ 2016-07-01 10:17 UTC (permalink / raw)
To: Laurent Vivier; +Cc: QEMU Developers, Riku Voipio, Patch Tracking
On 30 June 2016 at 18:51, Laurent Vivier <laurent@vivier.eu> wrote:
>
>
> Le 30/06/2016 à 18:33, Peter Maydell a écrit :
>> Older kernels don't have F_SETPIPE_SZ and F_GETPIPE_SZ (in
>> particular RHEL6's system headers don't define these). Add
>> ifdefs so that we can gracefully fall back to not supporting
>> those guest ioctls rather than failing to build.
>>
>> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
>
> Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Thanks; applied to master as a build fix.
-- PMM
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-07-01 10:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-30 16:33 [Qemu-devel] [PATCH] linux-user: Fix compilation when F_SETPIPE_SZ isn't defined Peter Maydell
2016-06-30 17:51 ` Laurent Vivier
2016-07-01 10:17 ` Peter Maydell
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).