diff options
| author | Yi Min Zhao | 2018-05-31 05:29:37 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2018-05-31 19:12:13 +0200 |
| commit | 0dd693ef1f15b6e9c4ba8b0118663e10338077cf (patch) | |
| tree | 1d03766cddf38d59d808e9a70b22359749633cd9 /include | |
| parent | Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-2.13-pull-r... (diff) | |
| download | qemu-0dd693ef1f15b6e9c4ba8b0118663e10338077cf.tar.gz qemu-0dd693ef1f15b6e9c4ba8b0118663e10338077cf.tar.xz qemu-0dd693ef1f15b6e9c4ba8b0118663e10338077cf.zip | |
sandbox: disable -sandbox if CONFIG_SECCOMP undefined
If CONFIG_SECCOMP is undefined, the option 'elevateprivileges' remains
compiled. This would make libvirt set the corresponding capability and
then trigger failure during guest startup. This patch moves the code
regarding seccomp command line options to qemu-seccomp.c file and
wraps qemu_opts_foreach finding sandbox option with CONFIG_SECCOMP.
Because parse_sandbox() is moved into qemu-seccomp.c file, change
seccomp_start() to static function.
Signed-off-by: Yi Min Zhao <zyimin@linux.ibm.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Tested-by: Ján Tomko <jtomko@redhat.com>
Acked-by: Eduardo Otubo <otubo@redhat.com>
Message-Id: <20180531032937.1925-1-zyimin@linux.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
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 |