qemu: capabilities: deprecate QEMU_CAPS_SECCOMP_BLACKLIST

Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2025-02-21 19:02:25 +00:00 · 2021-09-24 16:22:06 +02:00 · 2021-09-24 16:22:06 +02:00 · 3f3cf5899c
commit 3f3cf5899c
parent cfb8951e68
41 changed files with 2 additions and 42 deletions
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@ -468,7 +468,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
              /* 285 */
              "qcow2-luks", /* QEMU_CAPS_QCOW2_LUKS */
              "pcie-pci-bridge", /* QEMU_CAPS_DEVICE_PCIE_PCI_BRIDGE */
-              "seccomp-blacklist", /* QEMU_CAPS_SECCOMP_BLACKLIST */
+              "seccomp-blacklist", /* X_QEMU_CAPS_SECCOMP_BLACKLIST */
              "query-cpus-fast", /* QEMU_CAPS_QUERY_CPUS_FAST */
              "disk-write-cache", /* QEMU_CAPS_DISK_WRITE_CACHE */

@ -3209,7 +3209,6 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = {
    { "numa", NULL, QEMU_CAPS_NUMA }, /* not needed after qemuCaps->version < 3000000 */
    { "overcommit", NULL, QEMU_CAPS_OVERCOMMIT },
    { "sandbox", "enable", QEMU_CAPS_SECCOMP_SANDBOX },
-    { "sandbox", "elevateprivileges", QEMU_CAPS_SECCOMP_BLACKLIST },
    { "spice", "gl", QEMU_CAPS_SPICE_GL },
    { "spice", "unix", QEMU_CAPS_SPICE_UNIX },
    { "spice", "rendernode", QEMU_CAPS_SPICE_RENDERNODE },
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@ -448,7 +448,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
    /* 285 */
    QEMU_CAPS_QCOW2_LUKS, /* qcow2 format support LUKS encryption */
    QEMU_CAPS_DEVICE_PCIE_PCI_BRIDGE, /* -device pcie-pci-bridge */
-    QEMU_CAPS_SECCOMP_BLACKLIST, /* -sandbox.elevateprivileges */
+    X_QEMU_CAPS_SECCOMP_BLACKLIST, /* -sandbox.elevateprivileges */
    QEMU_CAPS_QUERY_CPUS_FAST, /* query-cpus-fast command */
    QEMU_CAPS_DISK_WRITE_CACHE, /* qemu block frontends support write-cache param */

--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@ -79,7 +79,6 @@
  <flag name='virtio-mouse-ccw'/>
  <flag name='virtio-tablet-ccw'/>
  <flag name='qcow2-luks'/>
-  <flag name='seccomp-blacklist'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
  <flag name='pr-manager-helper'/>
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@ -149,7 +149,6 @@
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
-  <flag name='seccomp-blacklist'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
  <flag name='pr-manager-helper'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@ -112,7 +112,6 @@
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
-  <flag name='seccomp-blacklist'/>
  <flag name='query-cpus-fast'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@ -108,7 +108,6 @@
  <flag name='machine.pseries.max-cpu-compat'/>
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
-  <flag name='seccomp-blacklist'/>
  <flag name='query-cpus-fast'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@ -79,7 +79,6 @@
  <flag name='virtio-mouse-ccw'/>
  <flag name='virtio-tablet-ccw'/>
  <flag name='qcow2-luks'/>
-  <flag name='seccomp-blacklist'/>
  <flag name='query-cpus-fast'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@ -146,7 +146,6 @@
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
-  <flag name='seccomp-blacklist'/>
  <flag name='query-cpus-fast'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@ -107,7 +107,6 @@
  <flag name='machine.pseries.max-cpu-compat'/>
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
-  <flag name='seccomp-blacklist'/>
  <flag name='query-cpus-fast'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
@ -52,7 +52,6 @@
  <flag name='disk-share-rw'/>
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
-  <flag name='seccomp-blacklist'/>
  <flag name='query-cpus-fast'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
@ -52,7 +52,6 @@
  <flag name='disk-share-rw'/>
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
-  <flag name='seccomp-blacklist'/>
  <flag name='query-cpus-fast'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
@ -81,7 +81,6 @@
  <flag name='virtio-mouse-ccw'/>
  <flag name='virtio-tablet-ccw'/>
  <flag name='qcow2-luks'/>
-  <flag name='seccomp-blacklist'/>
  <flag name='query-cpus-fast'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@ -148,7 +148,6 @@
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
-  <flag name='seccomp-blacklist'/>
  <flag name='query-cpus-fast'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@ -108,7 +108,6 @@
  <flag name='machine.pseries.max-cpu-compat'/>
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
-  <flag name='seccomp-blacklist'/>
  <flag name='query-cpus-fast'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@ -148,7 +148,6 @@
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
-  <flag name='seccomp-blacklist'/>
  <flag name='query-cpus-fast'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
@ -113,7 +113,6 @@
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
-  <flag name='seccomp-blacklist'/>
  <flag name='query-cpus-fast'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
@ -115,7 +115,6 @@
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
-  <flag name='seccomp-blacklist'/>
  <flag name='query-cpus-fast'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
@ -115,7 +115,6 @@
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
-  <flag name='seccomp-blacklist'/>
  <flag name='query-cpus-fast'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
@ -115,7 +115,6 @@
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
-  <flag name='seccomp-blacklist'/>
  <flag name='query-cpus-fast'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
@ -81,7 +81,6 @@
  <flag name='virtio-mouse-ccw'/>
  <flag name='virtio-tablet-ccw'/>
  <flag name='qcow2-luks'/>
-  <flag name='seccomp-blacklist'/>
  <flag name='query-cpus-fast'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@ -147,7 +147,6 @@
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
-  <flag name='seccomp-blacklist'/>
  <flag name='query-cpus-fast'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@ -147,7 +147,6 @@
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
-  <flag name='seccomp-blacklist'/>
  <flag name='query-cpus-fast'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@ -115,7 +115,6 @@
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
-  <flag name='seccomp-blacklist'/>
  <flag name='query-cpus-fast'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@ -115,7 +115,6 @@
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
-  <flag name='seccomp-blacklist'/>
  <flag name='query-cpus-fast'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@ -81,7 +81,6 @@
  <flag name='virtio-mouse-ccw'/>
  <flag name='virtio-tablet-ccw'/>
  <flag name='qcow2-luks'/>
-  <flag name='seccomp-blacklist'/>
  <flag name='query-cpus-fast'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@ -148,7 +148,6 @@
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
-  <flag name='seccomp-blacklist'/>
  <flag name='query-cpus-fast'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@ -117,7 +117,6 @@
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
-  <flag name='seccomp-blacklist'/>
  <flag name='query-cpus-fast'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@ -117,7 +117,6 @@
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
-  <flag name='seccomp-blacklist'/>
  <flag name='query-cpus-fast'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@ -115,7 +115,6 @@
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
-  <flag name='seccomp-blacklist'/>
  <flag name='query-cpus-fast'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@ -148,7 +148,6 @@
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
-  <flag name='seccomp-blacklist'/>
  <flag name='query-cpus-fast'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@ -44,7 +44,6 @@
  <flag name='isa-serial'/>
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
-  <flag name='seccomp-blacklist'/>
  <flag name='query-cpus-fast'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@ -147,7 +147,6 @@
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
-  <flag name='seccomp-blacklist'/>
  <flag name='query-cpus-fast'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@ -116,7 +116,6 @@
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
-  <flag name='seccomp-blacklist'/>
  <flag name='query-cpus-fast'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@ -115,7 +115,6 @@
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
-  <flag name='seccomp-blacklist'/>
  <flag name='query-cpus-fast'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@ -113,7 +113,6 @@
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
-  <flag name='seccomp-blacklist'/>
  <flag name='query-cpus-fast'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@ -79,7 +79,6 @@
  <flag name='virtio-mouse-ccw'/>
  <flag name='virtio-tablet-ccw'/>
  <flag name='qcow2-luks'/>
-  <flag name='seccomp-blacklist'/>
  <flag name='query-cpus-fast'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@ -147,7 +147,6 @@
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
-  <flag name='seccomp-blacklist'/>
  <flag name='query-cpus-fast'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@ -117,7 +117,6 @@
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
-  <flag name='seccomp-blacklist'/>
  <flag name='query-cpus-fast'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@ -79,7 +79,6 @@
  <flag name='virtio-mouse-ccw'/>
  <flag name='virtio-tablet-ccw'/>
  <flag name='qcow2-luks'/>
-  <flag name='seccomp-blacklist'/>
  <flag name='query-cpus-fast'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@ -146,7 +146,6 @@
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
-  <flag name='seccomp-blacklist'/>
  <flag name='query-cpus-fast'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@ -145,7 +145,6 @@
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
-  <flag name='seccomp-blacklist'/>
  <flag name='query-cpus-fast'/>
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>