* [Qemu-devel] [PATCH buildfix for-2.0] linux-user: Fix build if headers don't define _LINUX_CAPABILITY_VERSION_1
@ 2014-03-19 16:15 Peter Maydell
2014-03-19 16:33 ` Laurent Desnogues
2014-03-19 18:37 ` Peter Maydell
0 siblings, 2 replies; 4+ messages in thread
From: Peter Maydell @ 2014-03-19 16:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Laurent Desnogues, Riku Voipio, patches
Older kernel headers don't define _LINUX_CAPABILITY_VERSION_1.
Switch to using the older _LINUX_CAPABILITY_VERSION; newer headers
still define this for source compatibility.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reported-by: Laurent Desnogues <laurent.desnogues@gmail.com>
---
linux-user/syscall.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 366b695..2eac6d5 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -7698,7 +7698,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
header.version = tswap32(target_header->version);
header.pid = tswap32(target_header->pid);
- if (header.version != _LINUX_CAPABILITY_VERSION_1) {
+ if (header.version != _LINUX_CAPABILITY_VERSION) {
/* Version 2 and up takes pointer to two user_data structs */
data_items = 2;
}
--
1.9.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH buildfix for-2.0] linux-user: Fix build if headers don't define _LINUX_CAPABILITY_VERSION_1
2014-03-19 16:15 [Qemu-devel] [PATCH buildfix for-2.0] linux-user: Fix build if headers don't define _LINUX_CAPABILITY_VERSION_1 Peter Maydell
@ 2014-03-19 16:33 ` Laurent Desnogues
2014-03-19 17:39 ` Peter Maydell
2014-03-19 18:37 ` Peter Maydell
1 sibling, 1 reply; 4+ messages in thread
From: Laurent Desnogues @ 2014-03-19 16:33 UTC (permalink / raw)
To: Peter Maydell; +Cc: Riku Voipio, qemu-devel@nongnu.org, Patch Tracking
On Wed, Mar 19, 2014 at 5:15 PM, Peter Maydell <peter.maydell@linaro.org> wrote:
> Older kernel headers don't define _LINUX_CAPABILITY_VERSION_1.
> Switch to using the older _LINUX_CAPABILITY_VERSION; newer headers
> still define this for source compatibility.
>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> Reported-by: Laurent Desnogues <laurent.desnogues@gmail.com>
I'm not sure I should send "Reviewed-by" for issues I reported,
but here it is.
Reviewed-by: Laurent Desnogues <laurent.desnogues@gmail.com>
Thanks,
Laurent
> ---
> linux-user/syscall.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index 366b695..2eac6d5 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -7698,7 +7698,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
> header.version = tswap32(target_header->version);
> header.pid = tswap32(target_header->pid);
>
> - if (header.version != _LINUX_CAPABILITY_VERSION_1) {
> + if (header.version != _LINUX_CAPABILITY_VERSION) {
> /* Version 2 and up takes pointer to two user_data structs */
> data_items = 2;
> }
> --
> 1.9.0
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH buildfix for-2.0] linux-user: Fix build if headers don't define _LINUX_CAPABILITY_VERSION_1
2014-03-19 16:33 ` Laurent Desnogues
@ 2014-03-19 17:39 ` Peter Maydell
0 siblings, 0 replies; 4+ messages in thread
From: Peter Maydell @ 2014-03-19 17:39 UTC (permalink / raw)
To: Laurent Desnogues; +Cc: Riku Voipio, qemu-devel@nongnu.org, Patch Tracking
On 19 March 2014 16:33, Laurent Desnogues <laurent.desnogues@gmail.com> wrote:
> On Wed, Mar 19, 2014 at 5:15 PM, Peter Maydell <peter.maydell@linaro.org> wrote:
>> Older kernel headers don't define _LINUX_CAPABILITY_VERSION_1.
>> Switch to using the older _LINUX_CAPABILITY_VERSION; newer headers
>> still define this for source compatibility.
>>
>> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
>> Reported-by: Laurent Desnogues <laurent.desnogues@gmail.com>
>
> I'm not sure I should send "Reviewed-by" for issues I reported,
> but here it is.
>
> Reviewed-by: Laurent Desnogues <laurent.desnogues@gmail.com>
Well, a confirmation that it actually fixes the problem it purports
to fix is always nice :-)
thanks
-- PMM
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH buildfix for-2.0] linux-user: Fix build if headers don't define _LINUX_CAPABILITY_VERSION_1
2014-03-19 16:15 [Qemu-devel] [PATCH buildfix for-2.0] linux-user: Fix build if headers don't define _LINUX_CAPABILITY_VERSION_1 Peter Maydell
2014-03-19 16:33 ` Laurent Desnogues
@ 2014-03-19 18:37 ` Peter Maydell
1 sibling, 0 replies; 4+ messages in thread
From: Peter Maydell @ 2014-03-19 18:37 UTC (permalink / raw)
To: QEMU Developers; +Cc: Laurent Desnogues, Riku Voipio, Patch Tracking
On 19 March 2014 16:15, Peter Maydell <peter.maydell@linaro.org> wrote:
> Older kernel headers don't define _LINUX_CAPABILITY_VERSION_1.
> Switch to using the older _LINUX_CAPABILITY_VERSION; newer headers
> still define this for source compatibility.
>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> Reported-by: Laurent Desnogues <laurent.desnogues@gmail.com>
Riku acked this via IRC, so applied to master as a buildfix.
thanks
-- PMM
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-03-19 18:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-19 16:15 [Qemu-devel] [PATCH buildfix for-2.0] linux-user: Fix build if headers don't define _LINUX_CAPABILITY_VERSION_1 Peter Maydell
2014-03-19 16:33 ` Laurent Desnogues
2014-03-19 17:39 ` Peter Maydell
2014-03-19 18:37 ` 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).