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>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index c2df3ab73a9335d339755b380abbb9f3b027df2c..7a675dbebe9400d382ed3da9fad096d4f77108e5 100644 (file)
--- 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 },

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index f6e1904c646215d5e42eedc393b527de831f030a..afd067f30a0af8708397a3b5907c5e008168c262 100644 (file)
--- 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 */
 

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index 21b055280eecfbb6f418fa2720cb64ea51231c4f..fd96d0ee785a0d95943ea9f7f855d3c7f12c3ce6 100644 (file)
--- 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'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index 16653c0f1666fd721993f9d1c3e6942c2464ff73..6db1dc3dc508eab8eae1605c0538fde6933f8b54 100644 (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'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index b7e03a76a877b987e87e423772c1042a03d5a516..a809caa6e553eb63b1c23bd9e17415b8841c17d6 100644 (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'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index bfd6e5fadbd56dd8d1affaa2d2327ea2a38ccf59..0d20588c3106924825503fb1fa4650b928eacc1b 100644 (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'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index 022eb4560d70be1afe959f9f0defb8c8113e0992..b3011aebe18975c50a7d53cc2dd48d5dd31e3bc5 100644 (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'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index 5d88fd37cf35e5a23a311844631816194d1d427e..be4940d555ce6672d097727d5f93efa19bda7036 100644 (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'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index f7125d0ba685715f3a4e718f373b9e6c7724eec4..8a4709845a98a28f07c34f0b354b82aecd7ce86b 100644 (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'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index e34691d2ddcba972254966964c9943bd07360451..3e5586c1e8087a3557ba224459e862f7be02380d 100644 (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'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index 1b72232f450a2cf8151f97cc9ec61f0b91317f5d..03f201dcab480ec68955eef2229bf0bb4c93144e 100644 (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'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index f5f2dc1a30f8a12c9025093af22ffe108cf3a981..135444d24fc5c2bb99903f6b89d88b1b534b11a3 100644 (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'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index a92412b8154e8595fd118df6b1f739543dc1315b..9557794ecfa6ee43cfc2848e1ea80081d376185c 100644 (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'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index 91fa531151e97b591ad4e143e0d221be4d383065..f2e787228059f4dc53a3abd19711b51d292f709d 100644 (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'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index 2d1cc6c1eacbc4c2bfdad633a221243174fb7c81..9ae17d6832289fb7bdad06bacea51e53137750e7 100644 (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'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index 45b5130fcb034f770014d094456107822bc61cb1..1a87414fcbe81952339698a2e7c6bb5b65214246 100644 (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'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 268e882dc94cf3edd9668303d63e7baccf4eab56..8b6bc3891df5eaba7ee996931033c770c021af16 100644 (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'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index 8a5cbc8f0915898107323d96796ca93666ed724a..b55336bb83227e42b82b7e58c6cd9a8bb0afa877 100644 (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'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index 336d8ba92f1fc6c44d4a4333d0ac016b1ae56853..ff85afaea65e6bb6dbf3826da126db31f990dc4f 100644 (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'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index dcd5d4b341d03b272523e8c34b60d2d68c552548..1ea4c3effc9ce913429b5909829ad9a0546ccbb8 100644 (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'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index 11baa91c133ee0b9cb83784045c0e87c09d8efa9..05360319353de88540474bb796a5ed586dac46d1 100644 (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'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index 7067f448de80f6c27eac9cc72ac111bfd7cacd58..53ca4796ecf848c495f95ad0a305e166ecc5c55d 100644 (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'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
index fa6caa3649cd23ad7ad65aa99d3797ed3ca3a799..873c388821b498ed4532937415b5cdd6114698ed 100644 (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'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index 5137aa3d772aca028e4ec2614a40245d9ebf968f..463ae36b67c928903b950baa70ae68f52b478c4c 100644 (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'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index bf9e50d311ddf9116dfba7f2fcba4ccf9ac2efa7..26eaf7affb0eeed2902ce3ab7c2976c54fb92c67 100644 (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'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
index 3e7f059baa9fa11728041daa71ff0cf6d91a60a2..60a7ac60ed424284ce5b809d20074127777f73ba 100644 (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'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index 2d2d6d07c40a687a19ab20bf72f56ba161e3d8aa..080e2c650ca0dd7abe84a0957d808f0d5cd0c1d6 100644 (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'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index 777565603ab94314d49cb0fd1754421e42ba0313..868461bec2f6d889fbc93e00acc3951dc5315b02 100644 (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'/>