diff mbox series

seccomp: Don't include libseccomp from QEMU header

Message ID 20170920083647.14599-1-famz@redhat.com
State New
Headers show
Series seccomp: Don't include libseccomp from QEMU header | expand

Commit Message

Fam Zheng Sept. 20, 2017, 8:36 a.m. UTC
The only prototype doesn't need anything from the lib header, and not
including it here allows files that include this header, for example
vl.c, to compile without the libseccomp cflags.

The breakage is since c3883e1f93 for environments where `pkg-config
--cflags libseccomp" is non-empty.

Reported-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Fam Zheng <famz@redhat.com>

---

This is an alternative for

https://lists.gnu.org/archive/html/qemu-devel/2017-09/msg04470.html
([Qemu-devel] [PATCH] seccomp: Fix build)
---
 include/sysemu/seccomp.h | 2 --
 1 file changed, 2 deletions(-)

Comments

Jan Kiszka Sept. 22, 2017, 7:09 a.m. UTC | #1
On 2017-09-20 10:36, Fam Zheng wrote:
> The only prototype doesn't need anything from the lib header, and not
> including it here allows files that include this header, for example
> vl.c, to compile without the libseccomp cflags.
> 
> The breakage is since c3883e1f93 for environments where `pkg-config
> --cflags libseccomp" is non-empty.
> 
> Reported-by: Jan Kiszka <jan.kiszka@siemens.com>
> Signed-off-by: Fam Zheng <famz@redhat.com>
> 
> ---
> 
> This is an alternative for
> 
> https://lists.gnu.org/archive/html/qemu-devel/2017-09/msg04470.html
> ([Qemu-devel] [PATCH] seccomp: Fix build)
> ---
>  include/sysemu/seccomp.h | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/include/sysemu/seccomp.h b/include/sysemu/seccomp.h
> index e67c2dc840..9b092aa23f 100644
> --- a/include/sysemu/seccomp.h
> +++ b/include/sysemu/seccomp.h
> @@ -21,7 +21,5 @@
>  #define QEMU_SECCOMP_SET_SPAWN       (1 << 3)
>  #define QEMU_SECCOMP_SET_RESOURCECTL (1 << 4)
>  
> -#include <seccomp.h>
> -
>  int seccomp_start(uint32_t seccomp_opts);
>  #endif
> 

Works fine for me as well and is indeed cleaner.

Jan
Eduardo Otubo Sept. 22, 2017, 7:54 a.m. UTC | #2
On Fri, Sep 22, 2017 at 09:09:27AM +0200, Jan Kiszka wrote:
> On 2017-09-20 10:36, Fam Zheng wrote:
> > The only prototype doesn't need anything from the lib header, and not
> > including it here allows files that include this header, for example
> > vl.c, to compile without the libseccomp cflags.
> > 
> > The breakage is since c3883e1f93 for environments where `pkg-config
> > --cflags libseccomp" is non-empty.
> > 
> > Reported-by: Jan Kiszka <jan.kiszka@siemens.com>
> > Signed-off-by: Fam Zheng <famz@redhat.com>

Acked-by: Eduardo Otubo <otubo@redhat.com>

> > 
> > ---
> > 
> > This is an alternative for
> > 
> > https://lists.gnu.org/archive/html/qemu-devel/2017-09/msg04470.html
> > ([Qemu-devel] [PATCH] seccomp: Fix build)
> > ---
> >  include/sysemu/seccomp.h | 2 --
> >  1 file changed, 2 deletions(-)
> > 
> > diff --git a/include/sysemu/seccomp.h b/include/sysemu/seccomp.h
> > index e67c2dc840..9b092aa23f 100644
> > --- a/include/sysemu/seccomp.h
> > +++ b/include/sysemu/seccomp.h
> > @@ -21,7 +21,5 @@
> >  #define QEMU_SECCOMP_SET_SPAWN       (1 << 3)
> >  #define QEMU_SECCOMP_SET_RESOURCECTL (1 << 4)
> >  
> > -#include <seccomp.h>
> > -
> >  int seccomp_start(uint32_t seccomp_opts);
> >  #endif
> > 
> 
> Works fine for me as well and is indeed cleaner.
> 
> Jan
> 
> -- 
> Siemens AG, Corporate Technology, CT RDA ITP SES-DE
> Corporate Competence Center Embedded Linux
Peter Maydell Sept. 22, 2017, 9:35 a.m. UTC | #3
On 22 September 2017 at 08:54, Eduardo Otubo <otubo@redhat.com> wrote:
> On Fri, Sep 22, 2017 at 09:09:27AM +0200, Jan Kiszka wrote:
>> On 2017-09-20 10:36, Fam Zheng wrote:
>> > The only prototype doesn't need anything from the lib header, and not
>> > including it here allows files that include this header, for example
>> > vl.c, to compile without the libseccomp cflags.
>> >
>> > The breakage is since c3883e1f93 for environments where `pkg-config
>> > --cflags libseccomp" is non-empty.
>> >
>> > Reported-by: Jan Kiszka <jan.kiszka@siemens.com>
>> > Signed-off-by: Fam Zheng <famz@redhat.com>
>
> Acked-by: Eduardo Otubo <otubo@redhat.com>
>

Thanks. Applied to master as a buildfix.

-- PMM
diff mbox series

Patch

diff --git a/include/sysemu/seccomp.h b/include/sysemu/seccomp.h
index e67c2dc840..9b092aa23f 100644
--- a/include/sysemu/seccomp.h
+++ b/include/sysemu/seccomp.h
@@ -21,7 +21,5 @@ 
 #define QEMU_SECCOMP_SET_SPAWN       (1 << 3)
 #define QEMU_SECCOMP_SET_RESOURCECTL (1 << 4)
 
-#include <seccomp.h>
-
 int seccomp_start(uint32_t seccomp_opts);
 #endif