qemu: deprecate QEMU_CAPS_SECCOMP_SANDBOX

Implied by QEMU >= 1.2.0. Signed-off-by: N Ján Tomko <jtomko@redhat.com> Reviewed-by: N Andrea Bolognani <abologna@redhat.com>

qemu: deprecate QEMU_CAPS_SECCOMP_SANDBOX
Implied by QEMU >= 1.2.0. Signed-off-by: N Ján Tomko <jtomko@redhat.com> Reviewed-by: N Andrea Bolognani <abologna@redhat.com>
766d5c1b · Ján Tomko · d91890f3 · 766d5c1b · 766d5c1b · 766d5c1b
28 changed file
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -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);

--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -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 */

--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -10029,16 +10029,10 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
                                 ? qemucmd->env_value[i] : "");
    }
-    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SECCOMP_SANDBOX)) {
+    if (cfg->seccompSandbox == 0)
-        if (cfg->seccompSandbox == 0)
+        virCommandAddArgList(cmd, "-sandbox", "off", NULL);
-            virCommandAddArgList(cmd, "-sandbox", "off", NULL);
+    else if (cfg->seccompSandbox > 0)
-        else if (cfg->seccompSandbox > 0)
+        virCommandAddArgList(cmd, "-sandbox", "on", NULL);
-            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 (qemuBuildPanicCommandLine(cmd, def, qemuCaps) < 0)
        goto error;

--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@@ -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'/>

--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
@@ -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'/>

--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
@@ -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'/>

--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@@ -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'/>

--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
@@ -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'/>

--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@@ -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'/>

--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
@@ -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'/>

--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@@ -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'/>

--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -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'/>

--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -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'/>

--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -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'/>

--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -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'/>

--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -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'/>

--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -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'/>

--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -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'/>

--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
@@ -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'/>

--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
@@ -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'/>

--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -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'/>

--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
@@ -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'/>

--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@@ -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'/>

--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
@@ -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'/>

--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@@ -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'/>

--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
@@ -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'/>

--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
@@ -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'/>

--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@@ -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'/>