[Qemu-devel] [PATCH 4/4] linux-user/syscall.c: remove wrong forward decl of setgroups()

[Qemu-devel] [PATCH 4/4] linux-user/syscall.c: remove wrong forward decl of setgroups()

[John Spencer]

[-- Attachment #1: Type: text/plain, Size: 0 bytes --]



[-- Attachment #2: 0004-linux-user-syscall.c-remove-wrong-forward-decl-of-se.patch --]
[-- Type: text/x-patch, Size: 1267 bytes --]

>From 3d9bc5e06ae64806003f8999b4b7ead42bd19c5d Mon Sep 17 00:00:00 2001
From: John Spencer <maillist-qemu@barfooze.de>
Date: Mon, 10 Dec 2012 07:02:49 +0100
Subject: [PATCH 4/4] linux-user/syscall.c: remove wrong forward decl of setgroups()

this declaration is wrong:
the correct prototype on linux is:
int setgroups(size_t size, const gid_t *list);

since by default musl libc exposes this symbol in unistd.h
additionally to grp.h, the wrong declaration causes a build error.

the proper fix is to simply include the correct header.

Signed-off-by: John Spencer <maillist-qemu@barfooze.de>

---
 linux-user/syscall.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index fabbcd7..665316e 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -28,6 +28,7 @@
 #include <fcntl.h>
 #include <time.h>
 #include <limits.h>
+#include <grp.h>
 #include <sys/types.h>
 #include <sys/ipc.h>
 #include <sys/msg.h>
@@ -585,7 +586,6 @@ extern int personality(int);
 extern int flock(int, int);
 extern int setfsuid(int);
 extern int setfsgid(int);
-extern int setgroups(int, gid_t *);
 
 /* ARM EABI and MIPS expect 64bit types aligned even on pairs or registers */
 #ifdef TARGET_ARM
-- 
1.7.3.4

Re: [Qemu-devel] [PATCH 4/4] linux-user/syscall.c: remove wrong forward decl of setgroups()

[Stefan Weil]

Am 10.12.2012 07:16, schrieb John Spencer:

Your patch is not shown here because you had attached it to your email.
Please use "git send-email" to send patches.See also
http://wiki.qemu.org/Contribute/SubmitAPatch.

In your patch, you replaced a wrong forward declarationof function setgroups
by an include statement using grp.h. That's fine.

Reviewed-by: Stefan Weil <sw@weilnetz.de>

There are more extern declarations in linux-user/syscall.c.
Even if they are correct, they should be replaced by include statements.
If there will be a v2 of your patch series, you could add patches
for those declarations, too.

Regards
Stefan Weil

Re: [Qemu-devel] [PATCH 4/4] linux-user/syscall.c: remove wrong forward decl of setgroups()

[John Spencer]

On 12/10/2012 07:37 AM, Stefan Weil wrote:
> Am 10.12.2012 07:16, schrieb John Spencer:
>
> Your patch is not shown here because you had attached it to your email.
> Please use "git send-email" to send patches.See also
> http://wiki.qemu.org/Contribute/SubmitAPatch.

thanks, resent with git send-email.
i hope it is ok now.

>
> In your patch, you replaced a wrong forward declarationof function
> setgroups
> by an include statement using grp.h. That's fine.
>
> Reviewed-by: Stefan Weil <sw@weilnetz.de>
>
> There are more extern declarations in linux-user/syscall.c.
> Even if they are correct, they should be replaced by include statements.
> If there will be a v2 of your patch series, you could add patches
> for those declarations, too.

ok, will do separately after this first batch is merged.

Regards,
John Spencer

[Qemu-devel] [PATCH 1/4] fix implicit declaration of syscall() in linux-user/mmap.c

[John Spencer]

on glibc, this header is getting pulled in automatically via
another header, however on musl we need to include it explicitly.

linux-user/mmap.c:705:9: warning: implicit declaration of function 'syscall'
linux-user/mmap.c:705:9: warning: nested extern declaration of 'syscall'

Signed-off-by: John Spencer <maillist-qemu@barfooze.de>

---
 linux-user/mmap.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/linux-user/mmap.c b/linux-user/mmap.c
index b412e3f..171b449 100644
--- a/linux-user/mmap.c
+++ b/linux-user/mmap.c
@@ -25,6 +25,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
+#include <sys/syscall.h>
 #include <linux/mman.h>
 #include <linux/unistd.h>
 
-- 
1.7.3.4

[Qemu-devel] [PATCH 4/4] linux-user/syscall.c: remove wrong forward decl of setgroups()

[John Spencer]

this declaration is wrong:
the correct prototype on linux is:
int setgroups(size_t size, const gid_t *list);

since by default musl libc exposes this symbol in unistd.h
additionally to grp.h, the wrong declaration causes a build error.

the proper fix is to simply include the correct header.

Signed-off-by: John Spencer <maillist-qemu@barfooze.de>

---
 linux-user/syscall.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index fabbcd7..665316e 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -28,6 +28,7 @@
 #include <fcntl.h>
 #include <time.h>
 #include <limits.h>
+#include <grp.h>
 #include <sys/types.h>
 #include <sys/ipc.h>
 #include <sys/msg.h>
@@ -585,7 +586,6 @@ extern int personality(int);
 extern int flock(int, int);
 extern int setfsuid(int);
 extern int setfsgid(int);
-extern int setgroups(int, gid_t *);
 
 /* ARM EABI and MIPS expect 64bit types aligned even on pairs or registers */
 #ifdef TARGET_ARM
-- 
1.7.3.4

Re: [Qemu-devel] [PATCH 4/4] linux-user/syscall.c: remove wrong forward decl of setgroups()

[Stefan Weil]

Am 10.12.2012 07:59, schrieb John Spencer:
> this declaration is wrong:
> the correct prototype on linux is:
> int setgroups(size_t size, const gid_t *list);
>
> since by default musl libc exposes this symbol in unistd.h
> additionally to grp.h, the wrong declaration causes a build error.
>
> the proper fix is to simply include the correct header.
>
> Signed-off-by: John Spencer<maillist-qemu@barfooze.de>
>
> ---
>   linux-user/syscall.c |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index fabbcd7..665316e 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -28,6 +28,7 @@
>   #include<fcntl.h>
>   #include<time.h>
>   #include<limits.h>
> +#include<grp.h>
>   #include<sys/types.h>
>   #include<sys/ipc.h>
>   #include<sys/msg.h>
> @@ -585,7 +586,6 @@ extern int personality(int);
>   extern int flock(int, int);
>   extern int setfsuid(int);
>   extern int setfsgid(int);
> -extern int setgroups(int, gid_t *);
>
>   /* ARM EABI and MIPS expect 64bit types aligned even on pairs or registers */
>   #ifdef TARGET_ARM
>    


Reviewed-by: Stefan Weil <sw@weilnetz.de>