On 05/08/2012 07:00 AM, Alon Levy wrote:
Add "usbredir" channel to list of recognized spice
channels.
RHBZ: 819498
Signed-off-by: Alon Levy <alevy(a)redhat.com>
---
docs/formatdomain.html.in | 5 +-
docs/schemas/domaincommon.rng | 1 +
src/conf/domain_conf.c | 3 +-
src/conf/domain_conf.h | 1 +
.../qemuxml2argv-graphics-spice-usb-redir.args | 16 ++++++
.../qemuxml2argv-graphics-spice-usb-redir.xml | 53 ++++++++++++++++++++
tests/qemuxml2argvtest.c | 6 +++
7 files changed, 82 insertions(+), 3 deletions(-)
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-usb-redir.args
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-usb-redir.xml
I've been convinced that this is a bug worth fixing for 0.9.12 (without
properly listing all channels, you can inadvertently end up with
insecure channels, and security fixes outweigh the risk of new XML after
rc1 freeze).
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index e1fe0c4..0525577 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -2939,8 +2939,9 @@ qemu-kvm -net nic,model=? /dev/null
include <code>main</code>, <code>display</code>,
<code>inputs</code>, <code>cursor</code>,
<code>playback</code>, <code>record</code>;
- and <span class="since">since
- 0.8.8</span>: <code>smartcard</code>.
+ <span class="since">since
+ 0.8.8</span>: <code>smartcard</code> and <span
class="since">
+ since 0.9.12</span> <code>usbredir</code>.
Missing a colon; I tweaked this slightly.
ACK and pushed.
--
Eric Blake eblake(a)redhat.com +1-919-301-3266
Libvirt virtualization library
http://libvirt.org