qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH] seccomp: Don't include libseccomp from QEMU header
@ 2017-09-20  8:36 Fam Zheng
  2017-09-22  7:09 ` Jan Kiszka
  0 siblings, 1 reply; 4+ messages in thread
From: Fam Zheng @ 2017-09-20  8:36 UTC (permalink / raw)
  To: qemu-devel; +Cc: Eduardo Otubo, Jan Kiszka, Peter Maydell

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
-- 
2.13.5

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [Qemu-devel] [PATCH] seccomp: Don't include libseccomp from QEMU header
  2017-09-20  8:36 [Qemu-devel] [PATCH] seccomp: Don't include libseccomp from QEMU header Fam Zheng
@ 2017-09-22  7:09 ` Jan Kiszka
  2017-09-22  7:54   ` Eduardo Otubo
  0 siblings, 1 reply; 4+ messages in thread
From: Jan Kiszka @ 2017-09-22  7:09 UTC (permalink / raw)
  To: Fam Zheng, qemu-devel; +Cc: Eduardo Otubo, Peter Maydell

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

-- 
Siemens AG, Corporate Technology, CT RDA ITP SES-DE
Corporate Competence Center Embedded Linux

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [Qemu-devel] [PATCH] seccomp: Don't include libseccomp from QEMU header
  2017-09-22  7:09 ` Jan Kiszka
@ 2017-09-22  7:54   ` Eduardo Otubo
  2017-09-22  9:35     ` Peter Maydell
  0 siblings, 1 reply; 4+ messages in thread
From: Eduardo Otubo @ 2017-09-22  7:54 UTC (permalink / raw)
  To: Jan Kiszka; +Cc: Fam Zheng, qemu-devel, Peter Maydell

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

-- 
Eduardo Otubo
Senior Software Engineer @ RedHat

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [Qemu-devel] [PATCH] seccomp: Don't include libseccomp from QEMU header
  2017-09-22  7:54   ` Eduardo Otubo
@ 2017-09-22  9:35     ` Peter Maydell
  0 siblings, 0 replies; 4+ messages in thread
From: Peter Maydell @ 2017-09-22  9:35 UTC (permalink / raw)
  To: Eduardo Otubo; +Cc: Jan Kiszka, Fam Zheng, QEMU Developers

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

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2017-09-22  9:36 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-20  8:36 [Qemu-devel] [PATCH] seccomp: Don't include libseccomp from QEMU header Fam Zheng
2017-09-22  7:09 ` Jan Kiszka
2017-09-22  7:54   ` Eduardo Otubo
2017-09-22  9:35     ` 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).