diff mbox

[1/2] tools: Use POSIX poll.h instead of sys/poll.h

Message ID 20170417213311.29924-1-alistair.francis@xilinx.com (mailing list archive)
State New, archived
Headers show

Commit Message

Alistair Francis April 17, 2017, 9:33 p.m. UTC 
The POSIX spec specifies to use:
    #include <poll.h>
instead of:
    #include <sys/poll.h>
as seen here:
    http://pubs.opengroup.org/onlinepubs/009695399/functions/poll.html

This removes the warning:
    #warning redirecting incorrect #include <sys/poll.h> to <poll.h>
when building with the musl C-library.

Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
---
 tools/libxl/libxl_internal.h               | 2 +-
 tools/tests/xen-access/xen-access.c        | 2 +-
 tools/xenstat/libxenstat/src/xenstat_qmp.c | 2 +-
 tools/xentrace/xentrace.c                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

Comments

Wei Liu April 18, 2017, 10:02 a.m. UTC | #1 
On Mon, Apr 17, 2017 at 02:33:10PM -0700, Alistair Francis wrote:
> The POSIX spec specifies to use:
>     #include <poll.h>
> instead of:
>     #include <sys/poll.h>
> as seen here:
>     http://pubs.opengroup.org/onlinepubs/009695399/functions/poll.html
> 
> This removes the warning:
>     #warning redirecting incorrect #include <sys/poll.h> to <poll.h>
> when building with the musl C-library.
> 
> Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>

Acked-by: Wei Liu <wei.liu2@citrix.com>

FAOD, these are just mechanical changes. I don't think acks from Tamas
and George are strictly required.
Wei Liu April 18, 2017, 10:10 a.m. UTC | #2 
Cc Julien

I think these two patches should be in 4.9.

On Mon, Apr 17, 2017 at 02:33:10PM -0700, Alistair Francis wrote:
> The POSIX spec specifies to use:
>     #include <poll.h>
> instead of:
>     #include <sys/poll.h>
> as seen here:
>     http://pubs.opengroup.org/onlinepubs/009695399/functions/poll.html
> 
> This removes the warning:
>     #warning redirecting incorrect #include <sys/poll.h> to <poll.h>
> when building with the musl C-library.
> 
> Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
> ---
>  tools/libxl/libxl_internal.h               | 2 +-
>  tools/tests/xen-access/xen-access.c        | 2 +-
>  tools/xenstat/libxenstat/src/xenstat_qmp.c | 2 +-
>  tools/xentrace/xentrace.c                  | 2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
> index be24b76dfa..5d082c5704 100644
> --- a/tools/libxl/libxl_internal.h
> +++ b/tools/libxl/libxl_internal.h
> @@ -38,7 +38,7 @@
>  #include <ctype.h>
>  
>  #include <sys/mman.h>
> -#include <sys/poll.h>
> +#include <poll.h>
>  #include <sys/select.h>
>  #include <sys/stat.h>
>  #include <sys/time.h>
> diff --git a/tools/tests/xen-access/xen-access.c b/tools/tests/xen-access/xen-access.c
> index ff4d289b45..238011e010 100644
> --- a/tools/tests/xen-access/xen-access.c
> +++ b/tools/tests/xen-access/xen-access.c
> @@ -36,7 +36,7 @@
>  #include <signal.h>
>  #include <unistd.h>
>  #include <sys/mman.h>
> -#include <sys/poll.h>
> +#include <poll.h>
>  
>  #include <xenctrl.h>
>  #include <xenevtchn.h>
> diff --git a/tools/xenstat/libxenstat/src/xenstat_qmp.c b/tools/xenstat/libxenstat/src/xenstat_qmp.c
> index a87c9373c2..3fda487d49 100644
> --- a/tools/xenstat/libxenstat/src/xenstat_qmp.c
> +++ b/tools/xenstat/libxenstat/src/xenstat_qmp.c
> @@ -14,7 +14,7 @@
>  #include <fcntl.h>
>  #include <sys/types.h>
>  #include <sys/socket.h>
> -#include <sys/poll.h>
> +#include <poll.h>
>  #include <sys/un.h>
>  #include <stdlib.h>
>  #include <string.h>
> diff --git a/tools/xentrace/xentrace.c b/tools/xentrace/xentrace.c
> index f09fe6cf19..364a6fdad5 100644
> --- a/tools/xentrace/xentrace.c
> +++ b/tools/xentrace/xentrace.c
> @@ -24,7 +24,7 @@
>  #include <getopt.h>
>  #include <assert.h>
>  #include <ctype.h>
> -#include <sys/poll.h>
> +#include <poll.h>
>  #include <sys/statvfs.h>
>  
>  #include <xen/xen.h>
> -- 
> 2.11.0
>
Wei Liu April 18, 2017, 10:13 a.m. UTC | #3 
Really CC Julien. :-/

On Tue, Apr 18, 2017 at 11:10:59AM +0100, Wei Liu wrote:
> Cc Julien
> 
> I think these two patches should be in 4.9.
> 
> On Mon, Apr 17, 2017 at 02:33:10PM -0700, Alistair Francis wrote:
> > The POSIX spec specifies to use:
> >     #include <poll.h>
> > instead of:
> >     #include <sys/poll.h>
> > as seen here:
> >     http://pubs.opengroup.org/onlinepubs/009695399/functions/poll.html
> > 
> > This removes the warning:
> >     #warning redirecting incorrect #include <sys/poll.h> to <poll.h>
> > when building with the musl C-library.
> > 
> > Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
> > ---
> >  tools/libxl/libxl_internal.h               | 2 +-
> >  tools/tests/xen-access/xen-access.c        | 2 +-
> >  tools/xenstat/libxenstat/src/xenstat_qmp.c | 2 +-
> >  tools/xentrace/xentrace.c                  | 2 +-
> >  4 files changed, 4 insertions(+), 4 deletions(-)
> > 
> > diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
> > index be24b76dfa..5d082c5704 100644
> > --- a/tools/libxl/libxl_internal.h
> > +++ b/tools/libxl/libxl_internal.h
> > @@ -38,7 +38,7 @@
> >  #include <ctype.h>
> >  
> >  #include <sys/mman.h>
> > -#include <sys/poll.h>
> > +#include <poll.h>
> >  #include <sys/select.h>
> >  #include <sys/stat.h>
> >  #include <sys/time.h>
> > diff --git a/tools/tests/xen-access/xen-access.c b/tools/tests/xen-access/xen-access.c
> > index ff4d289b45..238011e010 100644
> > --- a/tools/tests/xen-access/xen-access.c
> > +++ b/tools/tests/xen-access/xen-access.c
> > @@ -36,7 +36,7 @@
> >  #include <signal.h>
> >  #include <unistd.h>
> >  #include <sys/mman.h>
> > -#include <sys/poll.h>
> > +#include <poll.h>
> >  
> >  #include <xenctrl.h>
> >  #include <xenevtchn.h>
> > diff --git a/tools/xenstat/libxenstat/src/xenstat_qmp.c b/tools/xenstat/libxenstat/src/xenstat_qmp.c
> > index a87c9373c2..3fda487d49 100644
> > --- a/tools/xenstat/libxenstat/src/xenstat_qmp.c
> > +++ b/tools/xenstat/libxenstat/src/xenstat_qmp.c
> > @@ -14,7 +14,7 @@
> >  #include <fcntl.h>
> >  #include <sys/types.h>
> >  #include <sys/socket.h>
> > -#include <sys/poll.h>
> > +#include <poll.h>
> >  #include <sys/un.h>
> >  #include <stdlib.h>
> >  #include <string.h>
> > diff --git a/tools/xentrace/xentrace.c b/tools/xentrace/xentrace.c
> > index f09fe6cf19..364a6fdad5 100644
> > --- a/tools/xentrace/xentrace.c
> > +++ b/tools/xentrace/xentrace.c
> > @@ -24,7 +24,7 @@
> >  #include <getopt.h>
> >  #include <assert.h>
> >  #include <ctype.h>
> > -#include <sys/poll.h>
> > +#include <poll.h>
> >  #include <sys/statvfs.h>
> >  
> >  #include <xen/xen.h>
> > -- 
> > 2.11.0
> >
Razvan Cojocaru April 18, 2017, 10:14 a.m. UTC | #4 
On 04/18/2017 01:02 PM, Wei Liu wrote:
> On Mon, Apr 17, 2017 at 02:33:10PM -0700, Alistair Francis wrote:
>> The POSIX spec specifies to use:
>>     #include <poll.h>
>> instead of:
>>     #include <sys/poll.h>
>> as seen here:
>>     http://pubs.opengroup.org/onlinepubs/009695399/functions/poll.html
>>
>> This removes the warning:
>>     #warning redirecting incorrect #include <sys/poll.h> to <poll.h>
>> when building with the musl C-library.
>>
>> Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
> 
> Acked-by: Wei Liu <wei.liu2@citrix.com>
> 
> FAOD, these are just mechanical changes. I don't think acks from Tamas
> and George are strictly required.

FWIW:

Acked-by: Razvan Cojocaru <rcojocaru@bitdefender.com>


Thanks,
Razvan
Julien Grall April 18, 2017, 11:30 a.m. UTC | #5 
Hi Wei,

Release-acked-by: Julien Grall <julien.grall@arm.com>

Cheers,

On 18/04/17 11:13, Wei Liu wrote:
> Really CC Julien. :-/
>
> On Tue, Apr 18, 2017 at 11:10:59AM +0100, Wei Liu wrote:
>> Cc Julien
>>
>> I think these two patches should be in 4.9.
>>
>> On Mon, Apr 17, 2017 at 02:33:10PM -0700, Alistair Francis wrote:
>>> The POSIX spec specifies to use:
>>>     #include <poll.h>
>>> instead of:
>>>     #include <sys/poll.h>
>>> as seen here:
>>>     http://pubs.opengroup.org/onlinepubs/009695399/functions/poll.html
>>>
>>> This removes the warning:
>>>     #warning redirecting incorrect #include <sys/poll.h> to <poll.h>
>>> when building with the musl C-library.
>>>
>>> Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
>>> ---
>>>  tools/libxl/libxl_internal.h               | 2 +-
>>>  tools/tests/xen-access/xen-access.c        | 2 +-
>>>  tools/xenstat/libxenstat/src/xenstat_qmp.c | 2 +-
>>>  tools/xentrace/xentrace.c                  | 2 +-
>>>  4 files changed, 4 insertions(+), 4 deletions(-)
>>>
>>> diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
>>> index be24b76dfa..5d082c5704 100644
>>> --- a/tools/libxl/libxl_internal.h
>>> +++ b/tools/libxl/libxl_internal.h
>>> @@ -38,7 +38,7 @@
>>>  #include <ctype.h>
>>>
>>>  #include <sys/mman.h>
>>> -#include <sys/poll.h>
>>> +#include <poll.h>
>>>  #include <sys/select.h>
>>>  #include <sys/stat.h>
>>>  #include <sys/time.h>
>>> diff --git a/tools/tests/xen-access/xen-access.c b/tools/tests/xen-access/xen-access.c
>>> index ff4d289b45..238011e010 100644
>>> --- a/tools/tests/xen-access/xen-access.c
>>> +++ b/tools/tests/xen-access/xen-access.c
>>> @@ -36,7 +36,7 @@
>>>  #include <signal.h>
>>>  #include <unistd.h>
>>>  #include <sys/mman.h>
>>> -#include <sys/poll.h>
>>> +#include <poll.h>
>>>
>>>  #include <xenctrl.h>
>>>  #include <xenevtchn.h>
>>> diff --git a/tools/xenstat/libxenstat/src/xenstat_qmp.c b/tools/xenstat/libxenstat/src/xenstat_qmp.c
>>> index a87c9373c2..3fda487d49 100644
>>> --- a/tools/xenstat/libxenstat/src/xenstat_qmp.c
>>> +++ b/tools/xenstat/libxenstat/src/xenstat_qmp.c
>>> @@ -14,7 +14,7 @@
>>>  #include <fcntl.h>
>>>  #include <sys/types.h>
>>>  #include <sys/socket.h>
>>> -#include <sys/poll.h>
>>> +#include <poll.h>
>>>  #include <sys/un.h>
>>>  #include <stdlib.h>
>>>  #include <string.h>
>>> diff --git a/tools/xentrace/xentrace.c b/tools/xentrace/xentrace.c
>>> index f09fe6cf19..364a6fdad5 100644
>>> --- a/tools/xentrace/xentrace.c
>>> +++ b/tools/xentrace/xentrace.c
>>> @@ -24,7 +24,7 @@
>>>  #include <getopt.h>
>>>  #include <assert.h>
>>>  #include <ctype.h>
>>> -#include <sys/poll.h>
>>> +#include <poll.h>
>>>  #include <sys/statvfs.h>
>>>
>>>  #include <xen/xen.h>
>>> --
>>> 2.11.0
>>>
diff mbox

Patch

diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index be24b76dfa..5d082c5704 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -38,7 +38,7 @@ 
 #include <ctype.h>
 
 #include <sys/mman.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/select.h>
 #include <sys/stat.h>
 #include <sys/time.h>
diff --git a/tools/tests/xen-access/xen-access.c b/tools/tests/xen-access/xen-access.c
index ff4d289b45..238011e010 100644
--- a/tools/tests/xen-access/xen-access.c
+++ b/tools/tests/xen-access/xen-access.c
@@ -36,7 +36,7 @@ 
 #include <signal.h>
 #include <unistd.h>
 #include <sys/mman.h>
-#include <sys/poll.h>
+#include <poll.h>
 
 #include <xenctrl.h>
 #include <xenevtchn.h>
diff --git a/tools/xenstat/libxenstat/src/xenstat_qmp.c b/tools/xenstat/libxenstat/src/xenstat_qmp.c
index a87c9373c2..3fda487d49 100644
--- a/tools/xenstat/libxenstat/src/xenstat_qmp.c
+++ b/tools/xenstat/libxenstat/src/xenstat_qmp.c
@@ -14,7 +14,7 @@ 
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/un.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/tools/xentrace/xentrace.c b/tools/xentrace/xentrace.c
index f09fe6cf19..364a6fdad5 100644
--- a/tools/xentrace/xentrace.c
+++ b/tools/xentrace/xentrace.c
@@ -24,7 +24,7 @@ 
 #include <getopt.h>
 #include <assert.h>
 #include <ctype.h>
-#include <sys/poll.h>
+#include <poll.h>
 #include <sys/statvfs.h>
 
 #include <xen/xen.h>