qemu: capabilities: Retire QEMU_CAPS_SPICE_FILE_XFER_DISABLE

Signed-off-by: Peter Krempa <pkrempa@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 f97f59f0a2eda46ef23185aeac77847cfa970c6e..db5432c9fc6c43b1b2261ee41206dbbf61f00abe 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -292,7 +292,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
 
               /* 160 */
               "enable-fips", /* QEMU_CAPS_ENABLE_FIPS */
-              "spice-file-xfer-disable", /* QEMU_CAPS_SPICE_FILE_XFER_DISABLE */
+              "spice-file-xfer-disable", /* X_QEMU_CAPS_SPICE_FILE_XFER_DISABLE */
               "spiceport", /* X_QEMU_CAPS_CHARDEV_SPICEPORT */
               "usb-kbd", /* QEMU_CAPS_DEVICE_USB_KBD */
               "host-pci-multidomain", /* X_QEMU_CAPS_HOST_PCI_MULTIDOMAIN */
@@ -3210,7 +3210,6 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = {
     { "overcommit", NULL, QEMU_CAPS_OVERCOMMIT },
     { "sandbox", "enable", QEMU_CAPS_SECCOMP_SANDBOX },
     { "sandbox", "elevateprivileges", QEMU_CAPS_SECCOMP_BLACKLIST },
-    { "spice", "disable-agent-file-xfer", QEMU_CAPS_SPICE_FILE_XFER_DISABLE },
     { "spice", "gl", QEMU_CAPS_SPICE_GL },
     { "spice", "unix", QEMU_CAPS_SPICE_UNIX },
     { "spice", "rendernode", QEMU_CAPS_SPICE_RENDERNODE },

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index ca54715b78ec5206546646bf067872e380b877a0..097f28bd400f6c3ea9b138bf61e325df413d92dc 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -271,7 +271,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
 
     /* 160 */
     QEMU_CAPS_ENABLE_FIPS, /* -enable-fips */
-    QEMU_CAPS_SPICE_FILE_XFER_DISABLE, /* -spice disable-agent-file-xfer */
+    X_QEMU_CAPS_SPICE_FILE_XFER_DISABLE, /* -spice disable-agent-file-xfer */
     X_QEMU_CAPS_CHARDEV_SPICEPORT, /* -chardev spiceport */
     QEMU_CAPS_DEVICE_USB_KBD, /* -device usb-kbd */
     X_QEMU_CAPS_HOST_PCI_MULTIDOMAIN, /* support domain > 0 in host pci address */

diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
index 379b0a50e08912773821fb7bd3b23ed1e115b107..1e08a04c820a73d81198a587e999c4b060ea2d68 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@@ -65,7 +65,6 @@
   <flag name='kvm-pit-lost-tick-policy'/>
   <flag name='pvpanic'/>
   <flag name='enable-fips'/>
-  <flag name='spice-file-xfer-disable'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index 5b23583938f1a978e5b28e3fc2d996cfc40b1753..43060efbacf6a9843d516a57593c2fc1ecfb0fa7 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -65,7 +65,6 @@
   <flag name='kvm-pit-lost-tick-policy'/>
   <flag name='pvpanic'/>
   <flag name='enable-fips'/>
-  <flag name='spice-file-xfer-disable'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
index 6f0726c6652d4b7659647a59864faaa7a011b444..35284d476da775279e1bad77462df8f80518c344 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@@ -64,7 +64,6 @@
   <flag name='kvm-pit-lost-tick-policy'/>
   <flag name='pvpanic'/>
   <flag name='enable-fips'/>
-  <flag name='spice-file-xfer-disable'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
index fee11f5ae32b14225514e1de40b578aa0393aa1c..b1f326c32b19801e645171fc89b2256461137d6b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@@ -64,7 +64,6 @@
   <flag name='kvm-pit-lost-tick-policy'/>
   <flag name='pvpanic'/>
   <flag name='enable-fips'/>
-  <flag name='spice-file-xfer-disable'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
index 34bf1d4f6c0d3a9ef287d80bf3ba0b1b44b9694e..4b3ff9c237c1aa7b1f78b62e05b1f4ff44cbff2e 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
@@ -53,7 +53,6 @@
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='enable-fips'/>
-  <flag name='spice-file-xfer-disable'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
index c541a8cd9b5b6145d8a02c47197eb5c3372131a1..44903c3b8f4949048dcc3d6dd5af24420582ceaa 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
@@ -53,7 +53,6 @@
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='enable-fips'/>
-  <flag name='spice-file-xfer-disable'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
index 6723148004a98b84e934c4fad103efd0c5ae6669..512239c6c8c98be1b17e22e2e75ddf7499d6cbc0 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@@ -64,7 +64,6 @@
   <flag name='kvm-pit-lost-tick-policy'/>
   <flag name='pvpanic'/>
   <flag name='enable-fips'/>
-  <flag name='spice-file-xfer-disable'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
index 3fc12db66ec7920ab28dbef7680f635448e9dc47..2f7f9caf0cea72d7c3f8c902b5f64d15a4287662 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@@ -64,7 +64,6 @@
   <flag name='kvm-pit-lost-tick-policy'/>
   <flag name='pvpanic'/>
   <flag name='enable-fips'/>
-  <flag name='spice-file-xfer-disable'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index a7e56a8237d2f842f23e4745f57c11e95de586a7..b8d53e0db17ea5c5ed4d776abb0fdc28c803c372 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -65,7 +65,6 @@
   <flag name='kvm-pit-lost-tick-policy'/>
   <flag name='pvpanic'/>
   <flag name='enable-fips'/>
-  <flag name='spice-file-xfer-disable'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index 11bd6ec8f2ed8bbe7bb8e6bba3ad3a585493a026..6a90077c13c0eea7fce969befbd015f78d21dc2a 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -53,7 +53,6 @@
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='enable-fips'/>
-  <flag name='spice-file-xfer-disable'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index 2ff75e93b6ef5b539f3bd47e647d67b2d1a25d20..c8934543bd3051bea0e965c3cb9a5dd9892b4eb0 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -65,7 +65,6 @@
   <flag name='kvm-pit-lost-tick-policy'/>
   <flag name='pvpanic'/>
   <flag name='enable-fips'/>
-  <flag name='spice-file-xfer-disable'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index e34ce1299951dbc6190738c3b346ce45f8f1e1a5..7b8abcd9021398494a1e391c864a8d436a54ed68 100644 (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='spice-file-xfer-disable'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>
   <flag name='memory-backend-ram'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index 4b0a5e51858c042000d387f18c8dddbcf16825b5..f17e502f75954205f50787e2c54c909491a49e8f 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -65,7 +65,6 @@
   <flag name='kvm-pit-lost-tick-policy'/>
   <flag name='pvpanic'/>
   <flag name='enable-fips'/>
-  <flag name='spice-file-xfer-disable'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index 1ee97231857285829f39e1f860f20bf34247e4dd..17d624525901a82fb329c2ef057aece36de2c154 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -52,7 +52,6 @@
   <flag name='usb-storage.removable'/>
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
-  <flag name='spice-file-xfer-disable'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index ea4e4c5b4459b00d8e56262993fdae4ca89a6070..e09880e9370b5ccad60d30e5508b3c5fa55a6e74 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -64,7 +64,6 @@
   <flag name='ich9-intel-hda'/>
   <flag name='kvm-pit-lost-tick-policy'/>
   <flag name='pvpanic'/>
-  <flag name='spice-file-xfer-disable'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index 0f98123c13037c530770f0a2a6840f074d49b979..571336c1fa6cb894543b92c1c1987b1bbb9575c3 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -63,7 +63,6 @@
   <flag name='ich9-intel-hda'/>
   <flag name='kvm-pit-lost-tick-policy'/>
   <flag name='pvpanic'/>
-  <flag name='spice-file-xfer-disable'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index df90a7f966c4f42fb6136d9ccfad3d89bce0ceb9..74b87847d04186e0a76ad06c2a8230dbb796ffe2 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -63,7 +63,6 @@
   <flag name='ich9-intel-hda'/>
   <flag name='kvm-pit-lost-tick-policy'/>
   <flag name='pvpanic'/>
-  <flag name='spice-file-xfer-disable'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
   <flag name='change-backing-file'/>