]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: capabilities: deprecate QEMU_CAPS_SECCOMP_BLACKLIST
authorJán Tomko <jtomko@redhat.com>
Fri, 24 Sep 2021 14:22:06 +0000 (16:22 +0200)
committerJán Tomko <jtomko@redhat.com>
Mon, 27 Sep 2021 08:11:21 +0000 (10:11 +0200)
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
41 files changed:
src/qemu/qemu_capabilities.c
src/qemu/qemu_capabilities.h
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml

index db5432c9fc6c43b1b2261ee41206dbbf61f00abe..4f18a2488a1369bac7a98fcf0bfea8146a36ef30 100644 (file)
@@ -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 },
index 097f28bd400f6c3ea9b138bf61e325df413d92dc..786c6958804ec66a990540806ba8b1576d5d992d 100644 (file)
@@ -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 */
 
index f2a89d5c58a67c3b8ba6c9c92fddaf2a46c802ff..602b7ea10f8f5515ddb6ee56c8ae4cb7dbc59beb 100644 (file)
@@ -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'/>
index 1e08a04c820a73d81198a587e999c4b060ea2d68..8749f4ee64a2f23b8810b1c95d10a32ba79aeed2 100644 (file)
   <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'/>
index 3b01fef4f1215cd69659751313f7a01ad8914e03..6e2daa8cea9b8cf23881de4a20a8b9b2a2ba975c 100644 (file)
   <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'/>
index a808015ab294194227c53f864a4c8ee841f10da2..bc6d8ac39605393b595468c16f39ab6a6b7ff317 100644 (file)
   <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'/>
index 288aba3bc0ad731adae5c0f78909c79a8be4146f..d66adcd8f465f69cd0b000e94b1e05d745eda116 100644 (file)
@@ -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'/>
index 43060efbacf6a9843d516a57593c2fc1ecfb0fa7..984529f5f52c4b45aac3ee484b7b3ba2d8961f2b 100644 (file)
   <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'/>
index 4c48c2ced289f2f7e3b586a61748588ea2db243e..fcfaef079ac81a386d010ae3c4cee5beea27f132 100644 (file)
   <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'/>
index e8fabd1817e2dc71956c321861005e342a162e63..7b4ca7c0a45bf231dd8dc4ab665ec6d797d9b490 100644 (file)
@@ -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'/>
index 1ac6e45ddc41fc8c2770b1d6944fdc1ceba68ebf..4a3d105ef87906bbe38a7122c856b5001221a8b7 100644 (file)
@@ -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'/>
index 1a2b45f43ba1c6b28737e0c143c40157d50f575a..d7a25264637a978a9c00de846d71c0110d0682c1 100644 (file)
@@ -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'/>
index 35284d476da775279e1bad77462df8f80518c344..5d4927a7e811e12cc8be5420c71eeabe26449fd9 100644 (file)
   <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'/>
index 5f15ce0b99257f63525c2158f90d2298dde66371..9a7be45ee90f7792b06f5d2492720b4b106abc97 100644 (file)
   <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'/>
index b1f326c32b19801e645171fc89b2256461137d6b..4e56e6290859fa0561d2cb2235a4397db6f51c6c 100644 (file)
   <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'/>
index de7a4952665aaa4b7f32758c26994e88a312a010..bc4e8032e7995d082ecd7d09c3255b3f373ab573 100644 (file)
   <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'/>
index d5dd46105e93e39a7d7f7abcd43b56914cf03c19..b312e77f9942ff176905436cfc962abc757f2b22 100644 (file)
   <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'/>
index 4b3ff9c237c1aa7b1f78b62e05b1f4ff44cbff2e..85186303246e10b4cf959fd916b9c9a7c20b6b3a 100644 (file)
   <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'/>
index 44903c3b8f4949048dcc3d6dd5af24420582ceaa..21e4cc7a2d7288fb4faf91497e535cac3b331acf 100644 (file)
   <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'/>
index f17003a4461189e6b6186fa7ee5397379ed03714..98d3ed773db9d063876cd3dd2282a9ba4f436134 100644 (file)
@@ -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'/>
index 512239c6c8c98be1b17e22e2e75ddf7499d6cbc0..49a5dfb25527828fa0ec4e683943cea6456d493e 100644 (file)
   <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'/>
index 2f7f9caf0cea72d7c3f8c902b5f64d15a4287662..8ebeae479f2cef5aa6c287d80f1a51ff7d8dab74 100644 (file)
   <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'/>
index 57470c66d9842eabf251d0fad4c862c3cfc0e950..4a8eb0a02ea341eae0a2c5226cd78d2f126e8cd8 100644 (file)
   <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'/>
index 6b2d2e0ea3fea476419888621f921a264c411b11..74dc0ff20cf1cfbff0f3cc601f02b5b846210c54 100644 (file)
   <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'/>
index 290de2730e02dd98a85c78d1f6f15856976ff7d5..9531360c2069b7872be406ee5192676f756d2cef 100644 (file)
@@ -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'/>
index b8d53e0db17ea5c5ed4d776abb0fdc28c803c372..826d7d73910eca869e9c55776cb43404093e19ae 100644 (file)
   <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'/>
index ac1ef8419579465b989d3cad51e4da8bad261fa5..69a7e49170533ef7037730791c0cb67afb9c777e 100644 (file)
   <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'/>
index 2708ac16f6ed2a2556a97648fe9d04d0acad49a5..13e4f6c8bb3b9c77a05efb2d59b41f955a13bd4a 100644 (file)
   <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'/>
index 6a90077c13c0eea7fce969befbd015f78d21dc2a..1244c3f3d37f21aac469adfa36bb1640ea89e00f 100644 (file)
   <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'/>
index c8934543bd3051bea0e965c3cb9a5dd9892b4eb0..4e52632455461f728e121b7a6e6320cfcd76ca2b 100644 (file)
   <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'/>
index 7b8abcd9021398494a1e391c864a8d436a54ed68..5e5e6f816b95f1fbff496fbe1bf7b17828a21ef9 100644 (file)
@@ -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'/>
index f17e502f75954205f50787e2c54c909491a49e8f..bfead7e2101041b2a48aef6d3484ce71326d5503 100644 (file)
   <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'/>
index bc524d5e9912f9aebf533ea234bb133dbb2c9691..0a3128de5bfd38daedcbd3fcb9556ed45844d2cf 100644 (file)
   <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'/>
index 82e89ba54459652f7a334e5f0dc84ed83c8d15aa..3e067e4e7e039a1fc537c1345bc7c02b0cfe2569 100644 (file)
   <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'/>
index 17d624525901a82fb329c2ef057aece36de2c154..02c7ff8da117ba7a6cf3b96751d53cfc393e35d3 100644 (file)
   <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'/>
index 3a0d0b585a059fd84ac30fa5fb169c549655db0e..fa207ffaf5574d343d65af8030bbaf06e2fa6953 100644 (file)
@@ -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'/>
index e09880e9370b5ccad60d30e5508b3c5fa55a6e74..d7ed08e12d2592772eaa784d3fc6214269e43fa4 100644 (file)
   <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'/>
index d678d713ad7340bebaa18b469c9730504cacefc4..78da04a3e58fec6934fdd70a680fbb36bd4361d6 100644 (file)
   <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'/>
index 1dc2f1fe19b6282a1755b62da793712f0d1cb356..a70a489d6214a562693d690758702dc9471f0f73 100644 (file)
@@ -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'/>
index 571336c1fa6cb894543b92c1c1987b1bbb9575c3..a84d5f30cf2c1eae1ff85aff96a09f380733d07a 100644 (file)
   <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'/>
index 74b87847d04186e0a76ad06c2a8230dbb796ffe2..f8f26eb9ff1a52efd37e303681698618d1997181 100644 (file)
   <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'/>