]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: capabilities: Retire QEMU_CAPS_OBJECT_JSON
authorPeter Krempa <pkrempa@redhat.com>
Wed, 12 Mar 2025 15:34:48 +0000 (16:34 +0100)
committerPeter Krempa <pkrempa@redhat.com>
Thu, 13 Mar 2025 14:38:16 +0000 (15:38 +0100)
Now that we dropped support for old qemus which didn't support JSON
props for -object we can retire the capability.

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 df9e630fbf3d505604a23017cf29cb364d9847c9..b6eb92376349c37fe681a0d50c5d2a27cd39b922 100644 (file)
@@ -622,7 +622,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
               "vnc-power-control", /* QEMU_CAPS_VNC_POWER_CONTROL */
               "audiodev", /* X_QEMU_CAPS_AUDIODEV */
               "blockdev-backup", /* X_QEMU_CAPS_BLOCKDEV_BACKUP */
-              "object.qapified", /* QEMU_CAPS_OBJECT_JSON */
+              "object.qapified", /* X_QEMU_CAPS_OBJECT_JSON */
               "rotation-rate", /* QEMU_CAPS_ROTATION_RATE */
 
               /* 400 */
@@ -1590,7 +1590,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
     { "netdev_add/arg-type/type/^dgram", QEMU_CAPS_NETDEV_JSON },
     { "netdev_add/arg-type/+user", QEMU_CAPS_NETDEV_USER },
     { "netdev_add/arg-type/+stream/reconnect-ms", QEMU_CAPS_NETDEV_STREAM_RECONNECT_MILISECONDS },
-    { "object-add/arg-type/qom-type/^secret", QEMU_CAPS_OBJECT_JSON },
     { "object-add/arg-type/+sev-guest/kernel-hashes", QEMU_CAPS_SEV_GUEST_KERNEL_HASHES },
     { "object-add/arg-type/+iothread/thread-pool-max", QEMU_CAPS_IOTHREAD_THREAD_POOL_MAX },
     { "query-display-options/ret-type/+egl-headless/rendernode", QEMU_CAPS_EGL_HEADLESS_RENDERNODE },
index d4e5be6918da8071b7b385a0b6e7be7d848bb991..4e247193e30956fb3378c0b6057917532313bd9c 100644 (file)
@@ -601,7 +601,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     QEMU_CAPS_VNC_POWER_CONTROL, /* -vnc power-control option */
     X_QEMU_CAPS_AUDIODEV, /* -audiodev instead of QEMU_AUDIO_DRV */
     X_QEMU_CAPS_BLOCKDEV_BACKUP, /* qemu supports the blockdev-backup job */
-    QEMU_CAPS_OBJECT_JSON, /* parameters for object-add are formally described */
+    X_QEMU_CAPS_OBJECT_JSON, /* parameters for object-add are formally described */
     QEMU_CAPS_ROTATION_RATE, /* scsi-disk / ide-drive rotation-rate prop */
 
     /* 400 */
index 3d4c715396af00ed0f02c277aa0b6893444f2651..041b480b2144dbbc6ca9db2501a7883fdf47db12 100644 (file)
@@ -84,7 +84,6 @@
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
index 951e16dffb28bfd33279041793b67e3056fc6446..3adef15db375b35fc6590d2b793e5cec59ab5095 100644 (file)
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
index f0f3bf774fff8a370760d819128168d55718bc95..66932b6ddea2e7a40af72b7f91fdd5e1f4dca758 100644 (file)
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
index 6e695335ab5024726243213387b0bbc87b427f95..dd59c4da90ed54027dde73979146dac7f76b2eb0 100644 (file)
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
index 227dbdcddd3c7fdc6c62ebb0fb6cd591d98a6305..2653be7df14d83435b4840d6979015c98a2e544c 100644 (file)
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
index 744c62d7980960423981550849c566c748680596..307f257fc6685095c63cf58eee502820f9fb77f3 100644 (file)
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
index ee810d5a444dce317191730cae55dd8d635f8c95..6e3d24ddffed68025a1daf1a0fc283d9cd7e5f8c 100644 (file)
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
index 66faa7614c65f742c8c33cd5f5ab8e8c1376d363..9e6e14d4491d51ad1c43ffd595aa21e8d664ba5a 100644 (file)
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
index d826df0a4c07fb60068dcd9c246f9b00376d2ee6..023a70affacaa7bcf76f818f45d73a04a2d374fa 100644 (file)
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
index 029f15b1f76eaa2e6c3994545b7b55e2504662b6..4acb0e816a3175fcfa4ce57808819b9099bac8dc 100644 (file)
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
index e03b761ebaaecd3a9071baca78cebee04cd64de2..fab8967f5fb3e74c17fc99e19e47b128badafffa 100644 (file)
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
index 6568b222d6f747a8332ff8d2128083304045a33e..8b6cca995e7dcaaea6478b41694f6153aaec59af 100644 (file)
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
index 0dcba6aa6b95308cb8f99e5feec2de681bc45c2a..35a65f569a7e05048d05f756edf7c27240738c63 100644 (file)
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
index fc5716605983b616a62b89f7b5d2b21ac8a59219..e52114ec5882d22a909b47fce34592503bd7825b 100644 (file)
@@ -81,7 +81,6 @@
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
index 08a319eeee550a4f18080902502e65608a5c307a..11f3dbecf17b9e421e6c3a12b20f44a866736784 100644 (file)
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
index 712f4a9fecbf0c8d24397b29275bf873ddd3f1e3..306d25c4eb0a8a0d8fccd269d6e377e2913400a7 100644 (file)
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
index 784e0e04364905534653b6362ac2b4962ce95495..d6ecec4232a21d011f883e9ebbf8659bdeb553d8 100644 (file)
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
index 05b64ae401acf683fdf1e692577901e8b0edff39..f3f0d74bb2da0d79970661f8a08f25f4549fa454 100644 (file)
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
index c94aaaf92b184f3939c837d006851e900ba601e0..95a44e1f770711e15aa4b23fd08c89d02bf1fd64 100644 (file)
@@ -81,7 +81,6 @@
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
index e5780d38fad181526bbfdb0846fd93ebbc5fb468..0fcac909651a7d02476768f696f8b01263cf628e 100644 (file)
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
index 2e6b3b1fafd01e748bc6b495c92ed89196486b59..e84ab9da1a70a4ebadf3e053e4750ee23115c49e 100644 (file)
@@ -43,7 +43,6 @@
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
   <flag name='input-linux'/>
   <flag name='confidential-guest-support'/>
index 43958ed4bc4fff5e3d37e73c3ba9757662ba0a39..fd2a33125bb2971976b7a5ae32c5023d8b76bce4 100644 (file)
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
index de48bf5501817b12c356758a31c5a37fa78fbc22..9b725595d68b24740a943a12ca45910178eac5b2 100644 (file)
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
index ca5f53cdc3efd54d575a857e5249ce9a22e81beb..399351a71544b42a7d13bdde69239625bb875d29 100644 (file)
@@ -84,7 +84,6 @@
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
index 87b5f1ed1dffd494de31aec91d754b8ec76e0fe9..8a4f78278dcd4fd018171b71bd91b1b3eece3d24 100644 (file)
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
index d9a438d4dda2008912d038515754f5819787d40d..7a77d92f3dbfaa894893ac4fddbf6288cce453d2 100644 (file)
@@ -93,7 +93,6 @@
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
   <flag name='acpi-index'/>
   <flag name='confidential-guest-support'/>
index 9b961310f9cd89823a5e8bbcf667bd71ddc603dc..9381c8b6d73be90fe77026aa43bab56c545a9f05 100644 (file)
@@ -84,7 +84,6 @@
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
index 51227bcddcf79ee05a9e6e134a5ecbb2c6744ee9..702698758fb36321b422f329005e3e2c0e15ebf6 100644 (file)
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>
index 106d257a6e3b54befa586071fb14da810bb2aa55..fa66d6091ad0096d1ea181eb27d7b8c3a6ee832d 100644 (file)
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
   <flag name='acpi-index'/>
   <flag name='input-linux'/>