[libvirt] [PATCH 1/2] spice: detect if qemu can disable file transfer

[Michal Privoznik]

On 10.01.2014 18:21, Francesco Romani wrote:
> 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 detects if QEMU supports this option, and add
> a capability if does.
> ---
>  src/qemu/qemu_capabilities.c                  | 5 ++++-
>  src/qemu/qemu_capabilities.h                  | 1 +
>  tests/qemucapabilitiesdata/caps_1.6.0-1.caps  | 1 +
>  tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 +
>  4 files changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
> index 0538115..c3f2e65 100644
> --- 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 {
> @@ -2565,8 +2566,10 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps,
>      if (qemuCaps->version >= 1003001)
>          virQEMUCapsSet(qemuCaps, QEMU_CAPS_VNC_WEBSOCKET);
>  
> -    if (qemuCaps->version >= 1006000)
> +    if (qemuCaps->version >= 1006000) {
>          virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
> +        virQEMUCapsSet(qemuCaps, QEMU_CAPS_SPICE_FILE_XFER_DISABLE);
> +    }


I don't think we should enable this by version, but rather if the option
is detected on QMP. The rest looks okay.

Michal