External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-31 14:07:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: deprecate QEMU_CAPS_SECCOMP_SANDBOX

Browse Source 
Implied by QEMU >= 1.2.0.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
This commit is contained in:
Ján Tomko 2018-03-29 12:51:55 +02:00
parent d91890f30c
commit 766d5c1b5a
28 changed files with 5 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/qemu/qemu_capabilities.c
View File

@ -3625,7 +3625,6 @@ static qemuMonitorCallbacks callbacks = {
static void
virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
{
virQEMUCapsSet(qemuCaps, QEMU_CAPS_SECCOMP_SANDBOX);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_DTB);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_IPV6_MIGRATION);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_OPT);

2
src/qemu/qemu_capabilities.h
View File

@ -199,7 +199,7 @@ typedef enum {
QEMU_CAPS_USB_REDIR_FILTER, /* usb-redir.filter */
QEMU_CAPS_IDE_DRIVE_WWN, /* Is ide-drive.wwn available? */
QEMU_CAPS_SCSI_DISK_WWN, /* Is scsi-disk.wwn available? */
QEMU_CAPS_SECCOMP_SANDBOX, /* -sandbox */
X_QEMU_CAPS_SECCOMP_SANDBOX, /* -sandbox */
/* 110 */
QEMU_CAPS_REBOOT_TIMEOUT, /* -boot reboot-timeout */

14
src/qemu/qemu_command.c
View File

@ -10029,16 +10029,10 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
? qemucmd->env_value[i] : "");
}
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SECCOMP_SANDBOX)) {
if (cfg->seccompSandbox == 0)
virCommandAddArgList(cmd, "-sandbox", "off", NULL);
else if (cfg->seccompSandbox > 0)
virCommandAddArgList(cmd, "-sandbox", "on", NULL);
} else if (cfg->seccompSandbox > 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("QEMU does not support seccomp sandboxes"));
goto error;
}
if (cfg->seccompSandbox == 0)
virCommandAddArgList(cmd, "-sandbox", "off", NULL);
else if (cfg->seccompSandbox > 0)
virCommandAddArgList(cmd, "-sandbox", "on", NULL);
if (qemuBuildPanicCommandLine(cmd, def, qemuCaps) < 0)
goto error;

1
tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
View File

@ -47,7 +47,6 @@
<flag name='usb-redir.filter'/>
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='dump-guest-core'/>
<flag name='seamless-migration'/>

1
tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
View File

@ -47,7 +47,6 @@
<flag name='usb-redir.filter'/>
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='dump-guest-core'/>
<flag name='seamless-migration'/>

1
tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
View File

@ -47,7 +47,6 @@
<flag name='usb-redir.filter'/>
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='dump-guest-core'/>
<flag name='seamless-migration'/>

1
tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
View File

@ -47,7 +47,6 @@
<flag name='usb-redir.filter'/>
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='dump-guest-core'/>
<flag name='seamless-migration'/>

1
tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
View File

@ -35,7 +35,6 @@
<flag name='blockio'/>
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='dump-guest-core'/>
<flag name='seamless-migration'/>

1
tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
View File

@ -34,7 +34,6 @@
<flag name='blockio'/>
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='dump-guest-core'/>
<flag name='seamless-migration'/>

1
tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
View File

@ -20,7 +20,6 @@
<flag name='virtio-scsi-pci'/>
<flag name='blockio'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='dump-guest-core'/>
<flag name='seamless-migration'/>

1
tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
View File

@ -47,7 +47,6 @@
<flag name='usb-redir.filter'/>
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='dump-guest-core'/>
<flag name='seamless-migration'/>

1
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
View File

@ -20,7 +20,6 @@
<flag name='virtio-scsi-pci'/>
<flag name='blockio'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='dump-guest-core'/>
<flag name='seamless-migration'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
View File

@ -35,7 +35,6 @@
<flag name='blockio'/>
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='dump-guest-core'/>
<flag name='seamless-migration'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
View File

@ -34,7 +34,6 @@
<flag name='blockio'/>
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='dump-guest-core'/>
<flag name='seamless-migration'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
View File

@ -20,7 +20,6 @@
<flag name='virtio-scsi-pci'/>
<flag name='blockio'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='dump-guest-core'/>
<flag name='seamless-migration'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
View File

@ -45,7 +45,6 @@
<flag name='usb-redir.filter'/>
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='dump-guest-core'/>
<flag name='seamless-migration'/>

1
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
View File

@ -47,7 +47,6 @@
<flag name='usb-redir.filter'/>
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='dump-guest-core'/>
<flag name='seamless-migration'/>

1
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
View File

@ -47,7 +47,6 @@
<flag name='usb-redir.filter'/>
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='dump-guest-core'/>
<flag name='seamless-migration'/>

1
tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
View File

@ -37,7 +37,6 @@
<flag name='blockio'/>
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='dump-guest-core'/>
<flag name='seamless-migration'/>

1
tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
View File

@ -34,7 +34,6 @@
<flag name='blockio'/>
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='dump-guest-core'/>
<flag name='seamless-migration'/>

1
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
View File

@ -47,7 +47,6 @@
<flag name='usb-redir.filter'/>
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='dump-guest-core'/>
<flag name='seamless-migration'/>

1
tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
View File

@ -20,7 +20,6 @@
<flag name='virtio-scsi-pci'/>
<flag name='blockio'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='dump-guest-core'/>
<flag name='seamless-migration'/>

1
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
View File

@ -47,7 +47,6 @@
<flag name='usb-redir.filter'/>
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='dump-guest-core'/>
<flag name='seamless-migration'/>

1
tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
View File

@ -20,7 +20,6 @@
<flag name='virtio-scsi-pci'/>
<flag name='blockio'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='dump-guest-core'/>
<flag name='seamless-migration'/>

1
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
View File

@ -47,7 +47,6 @@
<flag name='usb-redir.filter'/>
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='dump-guest-core'/>
<flag name='seamless-migration'/>

1
tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
View File

@ -34,7 +34,6 @@
<flag name='blockio'/>
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='dump-guest-core'/>
<flag name='seamless-migration'/>

1
tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
View File

@ -20,7 +20,6 @@
<flag name='virtio-scsi-pci'/>
<flag name='blockio'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='dump-guest-core'/>
<flag name='seamless-migration'/>

1
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
View File

@ -47,7 +47,6 @@
<flag name='usb-redir.filter'/>
<flag name='ide-drive.wwn'/>
<flag name='scsi-disk.wwn'/>
<flag name='seccomp-sandbox'/>
<flag name='reboot-timeout'/>
<flag name='dump-guest-core'/>
<flag name='seamless-migration'/>