spice: detect if qemu can disable file transfer

spice-server offers an API to disable file transfer messages
on the agent channel between the client and the guest.
This is supported in qemu through the disable-agent-file-xfer option.

This patch detects if QEMU supports this option, and add
a capability if does.

Signed-off-by: Francesco Romani <fromani@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 0538115811dac39bedfd2c5fe4ebea438d60968c..84200478b5ee3a18db19b7a28105f8cb218ef621 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -247,6 +247,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
               "boot-strict", /* 160 */
               "pvpanic",
               "enable-fips",
+              "spice-file-xfer-disable"
     );
 
 struct _virQEMUCaps {
@@ -2286,6 +2287,7 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = {
     { "realtime", "mlock", QEMU_CAPS_MLOCK },
     { "boot-opts", "strict", QEMU_CAPS_BOOT_STRICT },
     { "boot-opts", "reboot-timeout", QEMU_CAPS_REBOOT_TIMEOUT },
+    { "spice", "disable-agent-file-xfer", QEMU_CAPS_SPICE_FILE_XFER_DISABLE },
 };
 
 static int

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index efb3f4378335fa9bf3dbbc4c61f7a005072dbc83..23dcccec5893e0dd1e0374585a48cd412ea8d2b2 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -201,6 +201,7 @@ enum virQEMUCapsFlags {
     QEMU_CAPS_BOOT_STRICT        = 160, /* -boot strict */
     QEMU_CAPS_DEVICE_PANIC       = 161, /* -device pvpanic */
     QEMU_CAPS_ENABLE_FIPS        = 162, /* -enable-fips */
+    QEMU_CAPS_SPICE_FILE_XFER_DISABLE = 163, /* -spice disable-agent-file-xfer */
 
     QEMU_CAPS_LAST,                   /* this must always be the last item */
 };

diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps
index 2d50cf98fc5de4bf79e18fe9d4d297d1d835f51a..61542a8603375f4148e7b7d214574a9cf48aaa7c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps
@@ -139,4 +139,5 @@
     <flag name='pvpanic'/>
     <flag name='reboot-timeout'/>
     <flag name='enable-fips'/>
+    <flag name='spice-file-xfer-disable'/>
   </qemuCaps>

diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps
index ba641772addbe696e33e0d95b7e94378ce0e3be0..8ce17aa20fde17dc5da995542a0f8de019dfea7b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps
@@ -137,4 +137,5 @@
     <flag name='boot-strict'/>
     <flag name='pvpanic'/>
     <flag name='reboot-timeout'/>
+    <flag name='spice-file-xfer-disable'/>
   </qemuCaps>