diff options
| author | Peter Maydell | 2018-06-01 14:11:30 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-06-01 14:11:30 +0200 |
| commit | c25e8bba1f546ea72744ccfab77f8a9e8a323be8 (patch) | |
| tree | 82f742cd079629bf6451341a3f377cd93be3d2f5 /include | |
| parent | Merge remote-tracking branch 'remotes/sstabellini-http/tags/xen-20180531-tag'... (diff) | |
| parent | sandbox: disable -sandbox if CONFIG_SECCOMP undefined (diff) | |
| download | qemu-c25e8bba1f546ea72744ccfab77f8a9e8a323be8.tar.gz qemu-c25e8bba1f546ea72744ccfab77f8a9e8a323be8.tar.xz qemu-c25e8bba1f546ea72744ccfab77f8a9e8a323be8.zip | |
Merge remote-tracking branch 'remotes/otubo/tags/pull-seccomp-20180601' into staging
pull-seccomp-20180601
# gpg: Signature made Fri 01 Jun 2018 13:01:18 BST
# gpg: using RSA key DF32E7C0F0FFF9A2
# gpg: Good signature from "Eduardo Otubo (Senior Software Engineer) <otubo@redhat.com>"
# Primary key fingerprint: D67E 1B50 9374 86B4 0723 DBAB DF32 E7C0 F0FF F9A2
* remotes/otubo/tags/pull-seccomp-20180601:
sandbox: disable -sandbox if CONFIG_SECCOMP undefined
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sysemu/seccomp.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/sysemu/seccomp.h b/include/sysemu/seccomp.h index 9b092aa23f..fe859894f6 100644 --- a/include/sysemu/seccomp.h +++ b/include/sysemu/seccomp.h @@ -21,5 +21,6 @@ #define QEMU_SECCOMP_SET_SPAWN (1 << 3) #define QEMU_SECCOMP_SET_RESOURCECTL (1 << 4) -int seccomp_start(uint32_t seccomp_opts); +int parse_sandbox(void *opaque, QemuOpts *opts, Error **errp); + #endif |