qemu: capabilities: Retire QEMU_CAPS_ACTIVE_COMMIT

Active block commit is supported since qemu-2.0 Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Pavel Hrdina <phrdina@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2022-07-15 16:13:19 +02:00 · 2022-07-15 16:13:19 +02:00 · fc0aa62377
parent 7ae3ddf4a6
commit fc0aa62377
28 changed files with 2 additions and 29 deletions
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@ -298,7 +298,7 @@ VIR_ENUM_IMPL(virQEMUCaps,

              /* 165 */
              "msg-timestamp", /* X_QEMU_CAPS_MSG_TIMESTAMP */
-              "active-commit", /* QEMU_CAPS_ACTIVE_COMMIT */
+              "active-commit", /* X_QEMU_CAPS_ACTIVE_COMMIT */
              "change-backing-file", /* X_QEMU_CAPS_CHANGE_BACKING_FILE */
              "memory-backend-ram", /* QEMU_CAPS_OBJECT_MEMORY_RAM */
              "numa", /* QEMU_CAPS_NUMA */
@ -1583,7 +1583,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioIOMMU[] =

 /* see documentation for virQEMUQAPISchemaPathGet for the query format */
 static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
-    { "block-commit/arg-type/*top",  QEMU_CAPS_ACTIVE_COMMIT },
    { "blockdev-add/arg-type/options/+gluster/debug-level", QEMU_CAPS_GLUSTER_DEBUG_LEVEL},
    { "blockdev-add/arg-type/+gluster/debug", QEMU_CAPS_GLUSTER_DEBUG_LEVEL},
    { "blockdev-add/arg-type/+vxhs", QEMU_CAPS_VXHS},
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@ -276,7 +276,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */

    /* 165 */
    X_QEMU_CAPS_MSG_TIMESTAMP, /* -msg timestamp */
-    QEMU_CAPS_ACTIVE_COMMIT, /* block-commit works without 'top' */
+    X_QEMU_CAPS_ACTIVE_COMMIT, /* block-commit works without 'top' */
    X_QEMU_CAPS_CHANGE_BACKING_FILE, /* change name of backing file in metadata */
    QEMU_CAPS_OBJECT_MEMORY_RAM, /* -object memory-backend-ram */
    QEMU_CAPS_NUMA, /* newer -numa handling with disjoint cpu ranges */
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@ -48,7 +48,6 @@
  <flag name='ich9-intel-hda'/>
  <flag name='enable-fips'/>
  <flag name='usb-kbd'/>
-  <flag name='active-commit'/>
  <flag name='memory-backend-ram'/>
  <flag name='numa'/>
  <flag name='memory-backend-file'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@ -47,7 +47,6 @@
  <flag name='ich9-intel-hda'/>
  <flag name='enable-fips'/>
  <flag name='usb-kbd'/>
-  <flag name='active-commit'/>
  <flag name='memory-backend-ram'/>
  <flag name='numa'/>
  <flag name='memory-backend-file'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@ -27,7 +27,6 @@
  <flag name='vfio-pci'/>
  <flag name='drive-discard'/>
  <flag name='enable-fips'/>
-  <flag name='active-commit'/>
  <flag name='memory-backend-ram'/>
  <flag name='numa'/>
  <flag name='memory-backend-file'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@ -63,7 +63,6 @@
  <flag name='pvpanic'/>
  <flag name='enable-fips'/>
  <flag name='usb-kbd'/>
-  <flag name='active-commit'/>
  <flag name='memory-backend-ram'/>
  <flag name='numa'/>
  <flag name='memory-backend-file'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@ -50,7 +50,6 @@
  <flag name='ich9-intel-hda'/>
  <flag name='enable-fips'/>
  <flag name='usb-kbd'/>
-  <flag name='active-commit'/>
  <flag name='memory-backend-ram'/>
  <flag name='numa'/>
  <flag name='memory-backend-file'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@ -48,7 +48,6 @@
  <flag name='ich9-intel-hda'/>
  <flag name='enable-fips'/>
  <flag name='usb-kbd'/>
-  <flag name='active-commit'/>
  <flag name='memory-backend-ram'/>
  <flag name='numa'/>
  <flag name='memory-backend-file'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@ -51,7 +51,6 @@
  <flag name='ich9-intel-hda'/>
  <flag name='enable-fips'/>
  <flag name='usb-kbd'/>
-  <flag name='active-commit'/>
  <flag name='memory-backend-ram'/>
  <flag name='numa'/>
  <flag name='memory-backend-file'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@ -63,7 +63,6 @@
  <flag name='pvpanic'/>
  <flag name='enable-fips'/>
  <flag name='usb-kbd'/>
-  <flag name='active-commit'/>
  <flag name='memory-backend-ram'/>
  <flag name='numa'/>
  <flag name='memory-backend-file'/>
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@ -18,7 +18,6 @@
  <flag name='rng-egd'/>
  <flag name='drive-discard'/>
  <flag name='enable-fips'/>
-  <flag name='active-commit'/>
  <flag name='memory-backend-ram'/>
  <flag name='numa'/>
  <flag name='memory-backend-file'/>
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@ -63,7 +63,6 @@
  <flag name='pvpanic'/>
  <flag name='enable-fips'/>
  <flag name='usb-kbd'/>
-  <flag name='active-commit'/>
  <flag name='memory-backend-ram'/>
  <flag name='numa'/>
  <flag name='memory-backend-file'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@ -49,7 +49,6 @@
  <flag name='virtio-mmio'/>
  <flag name='ich9-intel-hda'/>
  <flag name='usb-kbd'/>
-  <flag name='active-commit'/>
  <flag name='memory-backend-ram'/>
  <flag name='numa'/>
  <flag name='memory-backend-file'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@ -47,7 +47,6 @@
  <flag name='usb-storage.removable'/>
  <flag name='ich9-intel-hda'/>
  <flag name='usb-kbd'/>
-  <flag name='active-commit'/>
  <flag name='memory-backend-ram'/>
  <flag name='numa'/>
  <flag name='memory-backend-file'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@ -50,7 +50,6 @@
  <flag name='virtio-mmio'/>
  <flag name='ich9-intel-hda'/>
  <flag name='usb-kbd'/>
-  <flag name='active-commit'/>
  <flag name='memory-backend-ram'/>
  <flag name='numa'/>
  <flag name='memory-backend-file'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@ -26,7 +26,6 @@
  <flag name='pci-bridge'/>
  <flag name='vfio-pci'/>
  <flag name='drive-discard'/>
-  <flag name='active-commit'/>
  <flag name='memory-backend-ram'/>
  <flag name='numa'/>
  <flag name='memory-backend-file'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@ -62,7 +62,6 @@
  <flag name='kvm-pit-lost-tick-policy'/>
  <flag name='pvpanic'/>
  <flag name='usb-kbd'/>
-  <flag name='active-commit'/>
  <flag name='memory-backend-ram'/>
  <flag name='numa'/>
  <flag name='memory-backend-file'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@ -48,7 +48,6 @@
  <flag name='virtio-mmio'/>
  <flag name='ich9-intel-hda'/>
  <flag name='usb-kbd'/>
-  <flag name='active-commit'/>
  <flag name='memory-backend-ram'/>
  <flag name='numa'/>
  <flag name='memory-backend-file'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@ -26,7 +26,6 @@
  <flag name='pci-bridge'/>
  <flag name='vfio-pci'/>
  <flag name='drive-discard'/>
-  <flag name='active-commit'/>
  <flag name='memory-backend-ram'/>
  <flag name='numa'/>
  <flag name='memory-backend-file'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@ -61,7 +61,6 @@
  <flag name='kvm-pit-lost-tick-policy'/>
  <flag name='pvpanic'/>
  <flag name='usb-kbd'/>
-  <flag name='active-commit'/>
  <flag name='memory-backend-ram'/>
  <flag name='numa'/>
  <flag name='memory-backend-file'/>
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@ -61,7 +61,6 @@
  <flag name='kvm-pit-lost-tick-policy'/>
  <flag name='pvpanic'/>
  <flag name='usb-kbd'/>
-  <flag name='active-commit'/>
  <flag name='memory-backend-ram'/>
  <flag name='numa'/>
  <flag name='memory-backend-file'/>
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@ -53,7 +53,6 @@
  <flag name='virtio-mmio'/>
  <flag name='ich9-intel-hda'/>
  <flag name='usb-kbd'/>
-  <flag name='active-commit'/>
  <flag name='memory-backend-ram'/>
  <flag name='numa'/>
  <flag name='memory-backend-file'/>
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@ -47,7 +47,6 @@
  <flag name='usb-storage.removable'/>
  <flag name='ich9-intel-hda'/>
  <flag name='usb-kbd'/>
-  <flag name='active-commit'/>
  <flag name='memory-backend-ram'/>
  <flag name='numa'/>
  <flag name='memory-backend-file'/>
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@ -61,7 +61,6 @@
  <flag name='kvm-pit-lost-tick-policy'/>
  <flag name='pvpanic'/>
  <flag name='usb-kbd'/>
-  <flag name='active-commit'/>
  <flag name='memory-backend-ram'/>
  <flag name='numa'/>
  <flag name='memory-backend-file'/>
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@ -53,7 +53,6 @@
  <flag name='virtio-mmio'/>
  <flag name='ich9-intel-hda'/>
  <flag name='usb-kbd'/>
-  <flag name='active-commit'/>
  <flag name='memory-backend-ram'/>
  <flag name='numa'/>
  <flag name='memory-backend-file'/>
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@ -53,7 +53,6 @@
  <flag name='usb-storage.removable'/>
  <flag name='ich9-intel-hda'/>
  <flag name='usb-kbd'/>
-  <flag name='active-commit'/>
  <flag name='memory-backend-ram'/>
  <flag name='numa'/>
  <flag name='memory-backend-file'/>
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@ -61,7 +61,6 @@
  <flag name='kvm-pit-lost-tick-policy'/>
  <flag name='pvpanic'/>
  <flag name='usb-kbd'/>
-  <flag name='active-commit'/>
  <flag name='memory-backend-ram'/>
  <flag name='numa'/>
  <flag name='memory-backend-file'/>
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@ -61,7 +61,6 @@
  <flag name='kvm-pit-lost-tick-policy'/>
  <flag name='pvpanic'/>
  <flag name='usb-kbd'/>
-  <flag name='active-commit'/>
  <flag name='memory-backend-ram'/>
  <flag name='numa'/>
  <flag name='memory-backend-file'/>