qemu: capabilites: Retire QEMU_CAPS_INCREMENTAL_BACKUP

All supported qemu versions now support this. Retire the capability. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2025-03-20 06:50:22 +03:00 · 2025-03-12 17:06:39 +01:00 · 2025-03-12 17:06:39 +01:00 · e1bce4ecd2
commit e1bce4ecd2
parent 0b939c467a
31 changed files with 3 additions and 34 deletions
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@ -542,7 +542,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
              "vhost-user-vga", /* QEMU_CAPS_DEVICE_VHOST_USER_VGA */

              /* 340 */
-              "incremental-backup", /* QEMU_CAPS_INCREMENTAL_BACKUP */
+              "incremental-backup", /* X_QEMU_CAPS_INCREMENTAL_BACKUP */
              "query-cpu-model-baseline", /* QEMU_CAPS_QUERY_CPU_MODEL_BASELINE */
              "query-cpu-model-comparison", /* QEMU_CAPS_QUERY_CPU_MODEL_COMPARISON */
              "ramfb", /* QEMU_CAPS_DEVICE_RAMFB */
@ -5590,10 +5590,8 @@ virQEMUCapsInitQMPVersionCaps(virQEMUCaps *qemuCaps G_GNUC_UNUSED)
 * for libvirt to be able to drive it properly should be processed here.
 */
 void
-virQEMUCapsInitProcessCapsInterlock(virQEMUCaps *qemuCaps)
+virQEMUCapsInitProcessCapsInterlock(virQEMUCaps *qemuCaps G_GNUC_UNUSED)
 {
-    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_MIGRATION_PARAM_BLOCK_BITMAP_MAPPING))
-        virQEMUCapsSet(qemuCaps, QEMU_CAPS_INCREMENTAL_BACKUP);
 }


--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@ -521,7 +521,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
    QEMU_CAPS_DEVICE_VHOST_USER_VGA, /* -device vhost-user-vga */

    /* 340 */
-    QEMU_CAPS_INCREMENTAL_BACKUP, /* incremental backup is supported */
+    X_QEMU_CAPS_INCREMENTAL_BACKUP, /* incremental backup is supported */
    QEMU_CAPS_QUERY_CPU_MODEL_BASELINE, /* qmp query-cpu-model-baseline */
    QEMU_CAPS_QUERY_CPU_MODEL_COMPARISON, /* qmp query-cpu-model-comparison */
    QEMU_CAPS_DEVICE_RAMFB, /* -device ramfb */
--- a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
@ -60,7 +60,6 @@
  <flag name='migration-file-drop-cache'/>
  <flag name='dbus-vmstate'/>
  <flag name='vhost-user-gpu'/>
-  <flag name='incremental-backup'/>
  <flag name='query-cpu-model-baseline'/>
  <flag name='query-cpu-model-comparison'/>
  <flag name='drive-nvme'/>
--- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml
+++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml
@ -117,7 +117,6 @@
  <flag name='dbus-vmstate'/>
  <flag name='vhost-user-gpu'/>
  <flag name='vhost-user-vga'/>
-  <flag name='incremental-backup'/>
  <flag name='ramfb'/>
  <flag name='drive-nvme'/>
  <flag name='smp-dies'/>
--- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
@ -117,7 +117,6 @@
  <flag name='dbus-vmstate'/>
  <flag name='vhost-user-gpu'/>
  <flag name='vhost-user-vga'/>
-  <flag name='incremental-backup'/>
  <flag name='ramfb'/>
  <flag name='drive-nvme'/>
  <flag name='smp-dies'/>
--- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
@ -86,7 +86,6 @@
  <flag name='dbus-vmstate'/>
  <flag name='vhost-user-gpu'/>
  <flag name='vhost-user-vga'/>
-  <flag name='incremental-backup'/>
  <flag name='drive-nvme'/>
  <flag name='smp-dies'/>
  <flag name='i8042'/>
--- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
@ -118,7 +118,6 @@
  <flag name='dbus-vmstate'/>
  <flag name='vhost-user-gpu'/>
  <flag name='vhost-user-vga'/>
-  <flag name='incremental-backup'/>
  <flag name='ramfb'/>
  <flag name='drive-nvme'/>
  <flag name='smp-dies'/>
--- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
@ -95,7 +95,6 @@
  <flag name='dbus-vmstate'/>
  <flag name='vhost-user-gpu'/>
  <flag name='vhost-user-vga'/>
-  <flag name='incremental-backup'/>
  <flag name='drive-nvme'/>
  <flag name='smp-dies'/>
  <flag name='i8042'/>
--- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
@ -118,7 +118,6 @@
  <flag name='dbus-vmstate'/>
  <flag name='vhost-user-gpu'/>
  <flag name='vhost-user-vga'/>
-  <flag name='incremental-backup'/>
  <flag name='ramfb'/>
  <flag name='drive-nvme'/>
  <flag name='smp-dies'/>
--- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
@ -92,7 +92,6 @@
  <flag name='dbus-vmstate'/>
  <flag name='vhost-user-gpu'/>
  <flag name='vhost-user-vga'/>
-  <flag name='incremental-backup'/>
  <flag name='drive-nvme'/>
  <flag name='smp-dies'/>
  <flag name='i8042'/>
--- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
@ -118,7 +118,6 @@
  <flag name='dbus-vmstate'/>
  <flag name='vhost-user-gpu'/>
  <flag name='vhost-user-vga'/>
-  <flag name='incremental-backup'/>
  <flag name='ramfb'/>
  <flag name='drive-nvme'/>
  <flag name='smp-dies'/>
--- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
@ -86,7 +86,6 @@
  <flag name='migration-file-drop-cache'/>
  <flag name='dbus-vmstate'/>
  <flag name='vhost-user-gpu'/>
-  <flag name='incremental-backup'/>
  <flag name='drive-nvme'/>
  <flag name='smp-dies'/>
  <flag name='i8042'/>
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
@ -117,7 +117,6 @@
  <flag name='dbus-vmstate'/>
  <flag name='vhost-user-gpu'/>
  <flag name='vhost-user-vga'/>
-  <flag name='incremental-backup'/>
  <flag name='ramfb'/>
  <flag name='drive-nvme'/>
  <flag name='smp-dies'/>
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
@ -118,7 +118,6 @@
  <flag name='dbus-vmstate'/>
  <flag name='vhost-user-gpu'/>
  <flag name='vhost-user-vga'/>
-  <flag name='incremental-backup'/>
  <flag name='ramfb'/>
  <flag name='drive-nvme'/>
  <flag name='smp-dies'/>
--- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
@ -118,7 +118,6 @@
  <flag name='dbus-vmstate'/>
  <flag name='vhost-user-gpu'/>
  <flag name='vhost-user-vga'/>
-  <flag name='incremental-backup'/>
  <flag name='ramfb'/>
  <flag name='drive-nvme'/>
  <flag name='smp-dies'/>
--- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
@ -57,7 +57,6 @@
  <flag name='migration-file-drop-cache'/>
  <flag name='dbus-vmstate'/>
  <flag name='vhost-user-gpu'/>
-  <flag name='incremental-backup'/>
  <flag name='query-cpu-model-baseline'/>
  <flag name='query-cpu-model-comparison'/>
  <flag name='drive-nvme'/>
--- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
@ -118,7 +118,6 @@
  <flag name='dbus-vmstate'/>
  <flag name='vhost-user-gpu'/>
  <flag name='vhost-user-vga'/>
-  <flag name='incremental-backup'/>
  <flag name='ramfb'/>
  <flag name='drive-nvme'/>
  <flag name='smp-dies'/>
--- a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml
@ -90,7 +90,6 @@
  <flag name='migration-file-drop-cache'/>
  <flag name='dbus-vmstate'/>
  <flag name='vhost-user-gpu'/>
-  <flag name='incremental-backup'/>
  <flag name='ramfb'/>
  <flag name='arm-max-cpu'/>
  <flag name='drive-nvme'/>
--- a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml
@ -95,7 +95,6 @@
  <flag name='migration-file-drop-cache'/>
  <flag name='dbus-vmstate'/>
  <flag name='vhost-user-gpu'/>
-  <flag name='incremental-backup'/>
  <flag name='ramfb'/>
  <flag name='arm-max-cpu'/>
  <flag name='drive-nvme'/>
--- a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml
@ -85,7 +85,6 @@
  <flag name='dbus-vmstate'/>
  <flag name='vhost-user-gpu'/>
  <flag name='vhost-user-vga'/>
-  <flag name='incremental-backup'/>
  <flag name='ramfb'/>
  <flag name='drive-nvme'/>
  <flag name='smp-dies'/>
--- a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml
@ -57,7 +57,6 @@
  <flag name='migration-file-drop-cache'/>
  <flag name='dbus-vmstate'/>
  <flag name='vhost-user-gpu'/>
-  <flag name='incremental-backup'/>
  <flag name='query-cpu-model-baseline'/>
  <flag name='query-cpu-model-comparison'/>
  <flag name='drive-nvme'/>
--- a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml
@ -118,7 +118,6 @@
  <flag name='dbus-vmstate'/>
  <flag name='vhost-user-gpu'/>
  <flag name='vhost-user-vga'/>
-  <flag name='incremental-backup'/>
  <flag name='ramfb'/>
  <flag name='drive-nvme'/>
  <flag name='smp-dies'/>
--- a/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml
@ -26,7 +26,6 @@
  <flag name='nbd-bitmap'/>
  <flag name='migration-file-drop-cache'/>
  <flag name='dbus-vmstate'/>
-  <flag name='incremental-backup'/>
  <flag name='drive-nvme'/>
  <flag name='smp-dies'/>
  <flag name='rng-builtin'/>
--- a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml
@ -118,7 +118,6 @@
  <flag name='dbus-vmstate'/>
  <flag name='vhost-user-gpu'/>
  <flag name='vhost-user-vga'/>
-  <flag name='incremental-backup'/>
  <flag name='ramfb'/>
  <flag name='drive-nvme'/>
  <flag name='smp-dies'/>
--- a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml
@ -89,7 +89,6 @@
  <flag name='dbus-vmstate'/>
  <flag name='vhost-user-gpu'/>
  <flag name='vhost-user-vga'/>
-  <flag name='incremental-backup'/>
  <flag name='ramfb'/>
  <flag name='drive-nvme'/>
  <flag name='smp-dies'/>
--- a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml
@ -60,7 +60,6 @@
  <flag name='migration-file-drop-cache'/>
  <flag name='dbus-vmstate'/>
  <flag name='vhost-user-gpu'/>
-  <flag name='incremental-backup'/>
  <flag name='query-cpu-model-baseline'/>
  <flag name='query-cpu-model-comparison'/>
  <flag name='drive-nvme'/>
--- a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml
@ -117,7 +117,6 @@
  <flag name='dbus-vmstate'/>
  <flag name='vhost-user-gpu'/>
  <flag name='vhost-user-vga'/>
-  <flag name='incremental-backup'/>
  <flag name='ramfb'/>
  <flag name='drive-nvme'/>
  <flag name='smp-dies'/>
--- a/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml
+++ b/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml
@ -69,7 +69,6 @@
  <flag name='nbd-bitmap'/>
  <flag name='bochs-display'/>
  <flag name='dbus-vmstate'/>
-  <flag name='incremental-backup'/>
  <flag name='ramfb'/>
  <flag name='arm-max-cpu'/>
  <flag name='drive-nvme'/>
--- a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml
@ -60,7 +60,6 @@
  <flag name='migration-file-drop-cache'/>
  <flag name='dbus-vmstate'/>
  <flag name='vhost-user-gpu'/>
-  <flag name='incremental-backup'/>
  <flag name='query-cpu-model-baseline'/>
  <flag name='query-cpu-model-comparison'/>
  <flag name='drive-nvme'/>
--- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml
+++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml
@ -118,7 +118,6 @@
  <flag name='dbus-vmstate'/>
  <flag name='vhost-user-gpu'/>
  <flag name='vhost-user-vga'/>
-  <flag name='incremental-backup'/>
  <flag name='ramfb'/>
  <flag name='drive-nvme'/>
  <flag name='smp-dies'/>
--- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml
@ -117,7 +117,6 @@
  <flag name='dbus-vmstate'/>
  <flag name='vhost-user-gpu'/>
  <flag name='vhost-user-vga'/>
-  <flag name='incremental-backup'/>
  <flag name='ramfb'/>
  <flag name='drive-nvme'/>
  <flag name='smp-dies'/>