Looks good to me with an amended commit log as pointed out by Doug. ACK from me (and 1.2.1 has been released, so it no longer needs to wait for end of freeze). Christophe On Wed, Jan 15, 2014 at 05:33:46PM +0100, Francesco Romani wrote: > Changes v4: > Addressed Christophe's comment and changed the error value. > Addressed Michal's comment and changed the capability is detected > (thanks for the hint on query-command-line-output, I was looking > in the wrong place). > > Changes v5: > rebased and squashed (hopefully right this time). > > Francesco Romani (2): > spice: detect if qemu can disable file transfer > spice: expose the QEMU disable file transfer option > > docs/formatdomain.html.in | 8 +++++ > docs/schemas/domaincommon.rng | 11 ++++++ > src/conf/domain_conf.c | 31 ++++++++++++++++- > src/conf/domain_conf.h | 10 ++++++ > src/libvirt_private.syms | 2 ++ > src/qemu/qemu_capabilities.c | 2 ++ > src/qemu/qemu_capabilities.h | 1 + > src/qemu/qemu_command.c | 9 +++++ > tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + > tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + > ...emuxml2argv-graphics-spice-agent-file-xfer.args | 9 +++++ > ...qemuxml2argv-graphics-spice-agent-file-xfer.xml | 40 ++++++++++++++++++++++ > .../qemuxml2argv-graphics-spice.args | 5 +-- > .../qemuxml2argv-graphics-spice.xml | 1 + > tests/qemuxml2argvtest.c | 9 ++++- > 15 files changed, 136 insertions(+), 4 deletions(-) > create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args > create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.xml > > -- > 1.8.4.2 > > -- > libvir-list mailing list > libvir-list@xxxxxxxxxx > https://www.redhat.com/mailman/listinfo/libvir-list
Attachment:
pgpFNnQzkIK4K.pgp
Description: PGP signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list