qemu: capabilities: Retire QEMU_CAPS_CHANGE_BACKING_FILE

The 'change-backing-file' command is unconditionally supported since qemu-2.1. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Pavel Hrdina <phrdina@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2025-02-01 17:35:17 +00:00 · 2022-07-15 16:07:03 +02:00 · 2022-07-15 16:07:03 +02:00 · 3d367a2c93
commit 3d367a2c93
parent e6f50bab56
28 changed files with 2 additions and 29 deletions
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@ -299,7 +299,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
              /* 165 */
              "msg-timestamp", /* X_QEMU_CAPS_MSG_TIMESTAMP */
              "active-commit", /* QEMU_CAPS_ACTIVE_COMMIT */
-              "change-backing-file", /* QEMU_CAPS_CHANGE_BACKING_FILE */
+              "change-backing-file", /* X_QEMU_CAPS_CHANGE_BACKING_FILE */
              "memory-backend-ram", /* QEMU_CAPS_OBJECT_MEMORY_RAM */
              "numa", /* QEMU_CAPS_NUMA */

@ -1206,7 +1206,6 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = {
    { "query-spice", QEMU_CAPS_SPICE },
    { "query-vnc", QEMU_CAPS_VNC },
    { "nbd-server-start", QEMU_CAPS_NBD_SERVER },
-    { "change-backing-file", QEMU_CAPS_CHANGE_BACKING_FILE },
    { "rtc-reset-reinjection", QEMU_CAPS_RTC_RESET_REINJECTION },
    { "query-hotpluggable-cpus", QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS },
    { "query-cpu-model-expansion", QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION },
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@ -277,7 +277,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' */
-    QEMU_CAPS_CHANGE_BACKING_FILE, /* change name of backing file in metadata */
+    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
@ -49,7 +49,6 @@
  <flag name='enable-fips'/>
  <flag name='usb-kbd'/>
  <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
  <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
@ -48,7 +48,6 @@
  <flag name='enable-fips'/>
  <flag name='usb-kbd'/>
  <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
  <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
@ -28,7 +28,6 @@
  <flag name='drive-discard'/>
  <flag name='enable-fips'/>
  <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
  <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
@ -64,7 +64,6 @@
  <flag name='enable-fips'/>
  <flag name='usb-kbd'/>
  <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
  <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
@ -51,7 +51,6 @@
  <flag name='enable-fips'/>
  <flag name='usb-kbd'/>
  <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
  <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
@ -49,7 +49,6 @@
  <flag name='enable-fips'/>
  <flag name='usb-kbd'/>
  <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
  <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
@ -52,7 +52,6 @@
  <flag name='enable-fips'/>
  <flag name='usb-kbd'/>
  <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
  <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
@ -64,7 +64,6 @@
  <flag name='enable-fips'/>
  <flag name='usb-kbd'/>
  <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
  <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
@ -19,7 +19,6 @@
  <flag name='drive-discard'/>
  <flag name='enable-fips'/>
  <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
  <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
@ -64,7 +64,6 @@
  <flag name='enable-fips'/>
  <flag name='usb-kbd'/>
  <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
  <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
@ -50,7 +50,6 @@
  <flag name='ich9-intel-hda'/>
  <flag name='usb-kbd'/>
  <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
  <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
@ -48,7 +48,6 @@
  <flag name='ich9-intel-hda'/>
  <flag name='usb-kbd'/>
  <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
  <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
@ -51,7 +51,6 @@
  <flag name='ich9-intel-hda'/>
  <flag name='usb-kbd'/>
  <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
  <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
@ -27,7 +27,6 @@
  <flag name='vfio-pci'/>
  <flag name='drive-discard'/>
  <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
  <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
@ -63,7 +63,6 @@
  <flag name='pvpanic'/>
  <flag name='usb-kbd'/>
  <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
  <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
@ -49,7 +49,6 @@
  <flag name='ich9-intel-hda'/>
  <flag name='usb-kbd'/>
  <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
  <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
@ -27,7 +27,6 @@
  <flag name='vfio-pci'/>
  <flag name='drive-discard'/>
  <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
  <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
@ -62,7 +62,6 @@
  <flag name='pvpanic'/>
  <flag name='usb-kbd'/>
  <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
  <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
@ -62,7 +62,6 @@
  <flag name='pvpanic'/>
  <flag name='usb-kbd'/>
  <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
  <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
@ -54,7 +54,6 @@
  <flag name='ich9-intel-hda'/>
  <flag name='usb-kbd'/>
  <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
  <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
@ -48,7 +48,6 @@
  <flag name='ich9-intel-hda'/>
  <flag name='usb-kbd'/>
  <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
  <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
@ -62,7 +62,6 @@
  <flag name='pvpanic'/>
  <flag name='usb-kbd'/>
  <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
  <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
@ -54,7 +54,6 @@
  <flag name='ich9-intel-hda'/>
  <flag name='usb-kbd'/>
  <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
  <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
@ -54,7 +54,6 @@
  <flag name='ich9-intel-hda'/>
  <flag name='usb-kbd'/>
  <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
  <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
@ -62,7 +62,6 @@
  <flag name='pvpanic'/>
  <flag name='usb-kbd'/>
  <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
  <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
@ -62,7 +62,6 @@
  <flag name='pvpanic'/>
  <flag name='usb-kbd'/>
  <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
  <flag name='memory-backend-ram'/>
  <flag name='numa'/>
  <flag name='memory-backend-file'/>