]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: capabilities: Retire QEMU_CAPS_COMPAT_DEPRECATED
authorPeter Krempa <pkrempa@redhat.com>
Wed, 12 Mar 2025 15:31:52 +0000 (16:31 +0100)
committerPeter Krempa <pkrempa@redhat.com>
Thu, 13 Mar 2025 14:38:16 +0000 (15:38 +0100)
The capability always exists in qemu and is no longer checked.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
31 files changed:
src/qemu/qemu_capabilities.c
src/qemu/qemu_capabilities.h
tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml
tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml
tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml
tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml
tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml
tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml
tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml
tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml
tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml
tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml
tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml
tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml
tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml
tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml
tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml

index 1262d4b39d62eb577b5e010aa376509d42b75410..df9e630fbf3d505604a23017cf29cb364d9847c9 100644 (file)
@@ -626,7 +626,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
               "rotation-rate", /* QEMU_CAPS_ROTATION_RATE */
 
               /* 400 */
-              "compat-deprecated", /* QEMU_CAPS_COMPAT_DEPRECATED */
+              "compat-deprecated", /* X_QEMU_CAPS_COMPAT_DEPRECATED */
               "acpi-index", /* QEMU_CAPS_ACPI_INDEX */
               "input-linux", /* QEMU_CAPS_INPUT_LINUX */
               "virtio-gpu-gl-pci", /* QEMU_CAPS_VIRTIO_GPU_GL_PCI */
@@ -5599,13 +5599,6 @@ virQEMUCapsInitProcessCapsInterlock(virQEMUCaps *qemuCaps)
     if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV_REOPEN) &&
         virQEMUCapsGet(qemuCaps, QEMU_CAPS_MIGRATION_PARAM_BLOCK_BITMAP_MAPPING))
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_INCREMENTAL_BACKUP);
-
-    /* The -compat qemu command line argument is implemented using a newer
-     * method which doesn't show up in query-command-line-options. As we'll use
-     * it only for development and testing purposes we can base the capability
-     * on a not entirely related witness. */
-    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_JSON))
-        virQEMUCapsSet(qemuCaps, QEMU_CAPS_COMPAT_DEPRECATED);
 }
 
 
index 840cb97dbe7624a1af6f891104c3347e38e72aa2..d4e5be6918da8071b7b385a0b6e7be7d848bb991 100644 (file)
@@ -605,7 +605,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     QEMU_CAPS_ROTATION_RATE, /* scsi-disk / ide-drive rotation-rate prop */
 
     /* 400 */
-    QEMU_CAPS_COMPAT_DEPRECATED, /* -compat deprecated-(input|output) is supported */
+    X_QEMU_CAPS_COMPAT_DEPRECATED, /* -compat deprecated-(input|output) is supported */
     QEMU_CAPS_ACPI_INDEX, /* PCI device 'acpi-index' property */
     QEMU_CAPS_INPUT_LINUX, /* -object input-linux */
     QEMU_CAPS_VIRTIO_GPU_GL_PCI, /* -device virtio-gpu-gl-pci */
index e0ad72d5d4c773fc39c63e74cd191e9bd154dad4..3d4c715396af00ed0f02c277aa0b6893444f2651 100644 (file)
@@ -86,7 +86,6 @@
   <flag name='vnc-power-control'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
-  <flag name='compat-deprecated'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
   <flag name='virtio-gpu-gl-pci'/>
index f8c3bbab2dadb7c0dc384ba34b4fd1d61d22c78e..951e16dffb28bfd33279041793b67e3056fc6446 100644 (file)
   <flag name='vnc-power-control'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
-  <flag name='compat-deprecated'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
   <flag name='virtio-gpu-gl-pci'/>
index 3585d4bd8bf71f45fe22f4df5f5f0909df7c21d4..f0f3bf774fff8a370760d819128168d55718bc95 100644 (file)
   <flag name='vnc-power-control'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
-  <flag name='compat-deprecated'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
   <flag name='virtio-gpu-gl-pci'/>
index d4172c31467b13cd1f840648fcafa8fd5b86b53e..6e695335ab5024726243213387b0bbc87b427f95 100644 (file)
   <flag name='vnc-power-control'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
-  <flag name='compat-deprecated'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
   <flag name='confidential-guest-support'/>
index 582b0e9b5245ae6c91342eb948ac854973f7d061..227dbdcddd3c7fdc6c62ebb0fb6cd591d98a6305 100644 (file)
   <flag name='vnc-power-control'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
-  <flag name='compat-deprecated'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
   <flag name='virtio-gpu-gl-pci'/>
index e02f42c5e0e53153f94df132a6d97c4e0da4888d..744c62d7980960423981550849c566c748680596 100644 (file)
   <flag name='vnc-power-control'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
-  <flag name='compat-deprecated'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
   <flag name='virtio-gpu-gl-pci'/>
index fd317a9afa5946094ffc9ab19c6a38dc81774885..ee810d5a444dce317191730cae55dd8d635f8c95 100644 (file)
   <flag name='vnc-power-control'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
-  <flag name='compat-deprecated'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
   <flag name='virtio-gpu-gl-pci'/>
index 427aa1ace96f2a09f78744a4717a7ba6f7175ea9..66faa7614c65f742c8c33cd5f5ab8e8c1376d363 100644 (file)
   <flag name='vnc-power-control'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
-  <flag name='compat-deprecated'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
   <flag name='virtio-gpu-gl-pci'/>
index 32e4e8e1bb8bc265998bc68444235869fe5a41d9..d826df0a4c07fb60068dcd9c246f9b00376d2ee6 100644 (file)
   <flag name='vnc-power-control'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
-  <flag name='compat-deprecated'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
   <flag name='virtio-gpu-gl-pci'/>
index 56cb66d3947a6de98ee21b42d467cf2f10b4ca52..029f15b1f76eaa2e6c3994545b7b55e2504662b6 100644 (file)
   <flag name='vnc-power-control'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
-  <flag name='compat-deprecated'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
   <flag name='virtio-gpu-gl-pci'/>
index 0ebcb94a3189013aebcd09919f0077919e359b87..e03b761ebaaecd3a9071baca78cebee04cd64de2 100644 (file)
   <flag name='vnc-power-control'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
-  <flag name='compat-deprecated'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
   <flag name='virtio-gpu-gl-pci'/>
index 025ced01d9efe91199c1a58c6880d504ca6b169d..6568b222d6f747a8332ff8d2128083304045a33e 100644 (file)
   <flag name='vnc-power-control'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
-  <flag name='compat-deprecated'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
   <flag name='virtio-gpu-gl-pci'/>
index 5f45788b777edc2d9ae31631b4559351b1c3f7bf..0dcba6aa6b95308cb8f99e5feec2de681bc45c2a 100644 (file)
   <flag name='vnc-power-control'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
-  <flag name='compat-deprecated'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
   <flag name='virtio-gpu-gl-pci'/>
index 16a3e3fbe0b93aea605965fabd37b324881b49c7..fc5716605983b616a62b89f7b5d2b21ac8a59219 100644 (file)
@@ -83,7 +83,6 @@
   <flag name='vnc-power-control'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
-  <flag name='compat-deprecated'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
   <flag name='confidential-guest-support'/>
index 7dee7f94c2b851fb7f9fcd0e03259cc097474afb..08a319eeee550a4f18080902502e65608a5c307a 100644 (file)
   <flag name='vnc-power-control'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
-  <flag name='compat-deprecated'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
   <flag name='virtio-gpu-gl-pci'/>
index 78082dbf3f0404902be0226b3ea91ee2f606a6f5..712f4a9fecbf0c8d24397b29275bf873ddd3f1e3 100644 (file)
   <flag name='vnc-power-control'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
-  <flag name='compat-deprecated'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
   <flag name='confidential-guest-support'/>
index 912eb45db675395f5c1bc9a78ca70ab345ee0caa..784e0e04364905534653b6362ac2b4962ce95495 100644 (file)
   <flag name='vnc-power-control'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
-  <flag name='compat-deprecated'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
   <flag name='virtio-gpu-gl-pci'/>
index 60b980e256e580bebeb1af89f34d84d52133c759..05b64ae401acf683fdf1e692577901e8b0edff39 100644 (file)
   <flag name='vnc-power-control'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
-  <flag name='compat-deprecated'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
   <flag name='confidential-guest-support'/>
index 8f3610408031c9165795ab99fd9d33b954da2ae6..c94aaaf92b184f3939c837d006851e900ba601e0 100644 (file)
@@ -83,7 +83,6 @@
   <flag name='vnc-power-control'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
-  <flag name='compat-deprecated'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
   <flag name='confidential-guest-support'/>
index 51e14736cd118bf73999a23c7e7c0c59b1f4f389..e5780d38fad181526bbfdb0846fd93ebbc5fb468 100644 (file)
   <flag name='vnc-power-control'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
-  <flag name='compat-deprecated'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
   <flag name='virtio-gpu-gl-pci'/>
index 1b56aebd489d7a7028ec2d50441e48b6156c404d..2e6b3b1fafd01e748bc6b495c92ed89196486b59 100644 (file)
@@ -45,7 +45,6 @@
   <flag name='vnc-power-control'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
-  <flag name='compat-deprecated'/>
   <flag name='input-linux'/>
   <flag name='confidential-guest-support'/>
   <flag name='set-action'/>
index 4b64547b1153d5de842a84a490394704a63195ec..43958ed4bc4fff5e3d37e73c3ba9757662ba0a39 100644 (file)
   <flag name='vnc-power-control'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
-  <flag name='compat-deprecated'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
   <flag name='virtio-gpu-gl-pci'/>
index ccc7673ba9c9f7f66a07ed43b33085f40c24a50a..de48bf5501817b12c356758a31c5a37fa78fbc22 100644 (file)
   <flag name='vnc-power-control'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
-  <flag name='compat-deprecated'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
   <flag name='virtio-gpu-gl-pci'/>
index a20b63051efa08d46c4617d569faec8c9a4f6394..ca5f53cdc3efd54d575a857e5249ce9a22e81beb 100644 (file)
@@ -86,7 +86,6 @@
   <flag name='vnc-power-control'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
-  <flag name='compat-deprecated'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
   <flag name='virtio-gpu-gl-pci'/>
index 196bab77973cc4ccbdd39a3893e47c6960ced288..87b5f1ed1dffd494de31aec91d754b8ec76e0fe9 100644 (file)
   <flag name='vnc-power-control'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
-  <flag name='compat-deprecated'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
   <flag name='virtio-gpu-gl-pci'/>
index b508eaf01f500d5c62bd20038f38382b9ab33c55..d9a438d4dda2008912d038515754f5819787d40d 100644 (file)
@@ -95,7 +95,6 @@
   <flag name='vnc-power-control'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
-  <flag name='compat-deprecated'/>
   <flag name='acpi-index'/>
   <flag name='confidential-guest-support'/>
   <flag name='set-action'/>
index 49a4a14dc1355dfe23f7355b471d401ff8c4d4db..9b961310f9cd89823a5e8bbcf667bd71ddc603dc 100644 (file)
@@ -86,7 +86,6 @@
   <flag name='vnc-power-control'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
-  <flag name='compat-deprecated'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
   <flag name='virtio-gpu-gl-pci'/>
index 6c9a3f6b5bc2975f9cb7e2dc655bf017c7ed9d06..51227bcddcf79ee05a9e6e134a5ecbb2c6744ee9 100644 (file)
   <flag name='vnc-power-control'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
-  <flag name='compat-deprecated'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
   <flag name='virtio-gpu-gl-pci'/>
index 824504dba0905ab4a289f3a132fdd83d4819daea..106d257a6e3b54befa586071fb14da810bb2aa55 100644 (file)
   <flag name='vnc-power-control'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
-  <flag name='compat-deprecated'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
   <flag name='virtio-gpu-gl-pci'/>