Signed-off-by: Peter Krempa <pkre...@redhat.com>
---
src/qemu/qemu_capabilities.c | 3 +--
src/qemu/qemu_capabilities.h | 2 +-
tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml | 1 -
tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 -
tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 -
19 files changed, 2 insertions(+), 20 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index f97f59f0a2..db5432c9fc 100644
--- 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 ca54715b78..097f28bd40 100644
--- 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 379b0a50e0..1e08a04c82 100644
--- 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 5b23583938..43060efbac 100644
--- 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 6f0726c665..35284d476d 100644
--- 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 fee11f5ae3..b1f326c32b 100644
--- 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 34bf1d4f6c..4b3ff9c237 100644
--- 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 c541a8cd9b..44903c3b8f 100644
--- 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 6723148004..512239c6c8 100644
--- 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 3fc12db66e..2f7f9caf0c 100644
--- 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 a7e56a8237..b8d53e0db1 100644
--- 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 11bd6ec8f2..6a90077c13 100644
--- 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 2ff75e93b6..c8934543bd 100644
--- 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 e34ce12999..7b8abcd902 100644
--- 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 4b0a5e5185..f17e502f75 100644
--- 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 1ee9723185..17d6245259 100644
--- 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 ea4e4c5b44..e09880e937 100644
--- 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 0f98123c13..571336c1fa 100644
--- 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 df90a7f966..74b87847d0 100644
--- 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'/>
--
2.31.1
