From: Michal Privoznik <mprivozn@redhat.com>
Date: Fri, 23 Nov 2012 08:25:20 +0000 (+0100)
Subject: qemuhelpdata: Revert my 'fix'
X-Git-Tag: CVE-2012-3411~86
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a154f5f313c1d8e3192b2c072f95e048de5afe18;p=thirdparty%2Flibvirt.git

qemuhelpdata: Revert my 'fix'

I was convicted that space at EOL should no be there
even for qemu help data. Hence, I've removed one in
commit bb2f6216119d50. However, it turns out we want
it exactly the way qemu produces it. So I should undo
my premature fix. A patch against qemu has been posted
as well.
---

diff --git a/tests/qemuhelpdata/qemu-kvm-1.2.0 b/tests/qemuhelpdata/qemu-kvm-1.2.0
index 7e2ba00abf..372002a697 100644
--- a/tests/qemuhelpdata/qemu-kvm-1.2.0
+++ b/tests/qemuhelpdata/qemu-kvm-1.2.0
@@ -126,7 +126,7 @@ Network options:
                 connect the user mode network stack to VLAN 'n', configure its
                 DHCP server and enabled optional services
 -net tap[,vlan=n][,name=str][,fd=h][,ifname=name][,script=file][,downscript=dfile][,helper=helper][,sndbuf=nbytes][,vnet_hdr=on|off][,vhost=on|off][,vhostfd=h][,vhostforce=on|off]
-                connect the host TAP network interface to VLAN 'n'
+                connect the host TAP network interface to VLAN 'n' 
                 use network scripts 'file' (default=/etc/qemu-ifup)
                 to configure it and 'dfile' (default=/etc/qemu-ifdown)
                 to deconfigure it