[libvirt] [PATCH] spice: add <clipboard copypaste='yes|no'> option
Eric Blake
eblake at redhat.com
Tue Jun 14 23:07:18 UTC 2011
On 06/14/2011 05:35 AM, Marc-André Lureau wrote:
>>From a security pov copy and paste between the guest and the client is not
Stupid 'git am' ate that line, I had to amend the commit to add it back
in without the leading '>'.
> always desirable. So we need to be able to enable/disable this. The best place
> to do this from an administration pov is on the hypervisor, so the qemu cmdline
> is getting a spice disable-copy-paste option, see bug 693645. Example qemu
> invocation:
> qemu -spice port=5932,disable-ticketing,disable-copy-paste
>
> https://bugzilla.redhat.com/show_bug.cgi?id=693661
> ---
> docs/formatdomain.html.in | 9 ++++++
> docs/schemas/domain.rng | 11 +++++++
> src/conf/domain_conf.c | 31 +++++++++++++++++++-
> src/conf/domain_conf.h | 10 ++++++
> src/qemu/qemu_command.c | 2 +
> .../qemuxml2argv-graphics-spice.args | 2 +-
> .../qemuxml2argv-graphics-spice.xml | 1 +
> 7 files changed, 64 insertions(+), 2 deletions(-)
You've now posted from a redhat.com and a gmail.com address; let me know
if I should update AUTHORS and .mailmap to highlight your preferred address.
> @@ -1862,6 +1863,14 @@ qemu-kvm -net nic,model=? /dev/null
> of <code>filter</code>, <code>all</code>
> or <code>off</code>, <span class="since">since 0.9.2</span>.
> </p>
> + <p>
> + Copy & Paste functionality (via Spice agent) is set
> + by the <code>clipboard</code> element. It is enabled by
> + default, and can be disabled by setting
> + the <code>copypaste</code> property
> + to <code>no</code>, <span class="since">since
> + 0.9.2</span>.
0.9.3.
ACK with one more change, so I pushed with this squashed in:
diff --git i/docs/formatdomain.html.in w/docs/formatdomain.html.in
index 91d5ade..267839b 100644
--- i/docs/formatdomain.html.in
+++ w/docs/formatdomain.html.in
@@ -1869,7 +1869,7 @@ qemu-kvm -net nic,model=? /dev/null
default, and can be disabled by setting
the <code>copypaste</code> property
to <code>no</code>, <span class="since">since
- 0.9.2</span>.
+ 0.9.3</span>.
</>
</dd>
<dt><code>"rdp"</code></dt>
diff --git i/src/libvirt_private.syms w/src/libvirt_private.syms
index 7a05539..6351938 100644
--- i/src/libvirt_private.syms
+++ w/src/libvirt_private.syms
@@ -274,8 +274,10 @@ virDomainGraphicsSpiceChannelModeTypeFromString;
virDomainGraphicsSpiceChannelModeTypeToString;
virDomainGraphicsSpiceChannelNameTypeFromString;
virDomainGraphicsSpiceChannelNameTypeToString;
-virDomainGraphicsSpiceImageCompressionTypeToString;
+virDomainGraphicsSpiceClipboardCopypasteFromString;
+virDomainGraphicsSpiceClipboardCopypasteToString;
virDomainGraphicsSpiceImageCompressionTypeFromString;
+virDomainGraphicsSpiceImageCompressionTypeToString;
virDomainGraphicsSpiceJpegCompressionTypeFromString;
virDomainGraphicsSpiceJpegCompressionTypeToString;
virDomainGraphicsSpicePlaybackCompressionTypeFromString;
--
Eric Blake eblake at redhat.com +1-801-349-2682
Libvirt virtualization library http://libvirt.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 619 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20110614/63ae4956/attachment-0001.sig>
More information about the libvir-list
mailing list