[Qemu-devel] [PATCH buildfix for-2.0] linux-user: Fix build if headers don't define _LINUX_CAPABILITY_VERSION_1

[Qemu-devel] [PATCH buildfix for-2.0] linux-user: Fix build if headers don't define _LINUX_CAPABILITY_VERSION_1

[Peter Maydell]

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

Re: [Qemu-devel] [PATCH buildfix for-2.0] linux-user: Fix build if headers don't define _LINUX_CAPABILITY_VERSION_1

[Laurent Desnogues]

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
>

Re: [Qemu-devel] [PATCH buildfix for-2.0] linux-user: Fix build if headers don't define _LINUX_CAPABILITY_VERSION_1

[Peter Maydell]

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

Re: [Qemu-devel] [PATCH buildfix for-2.0] linux-user: Fix build if headers don't define _LINUX_CAPABILITY_VERSION_1

[Peter Maydell]

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