Re: [Qemu-devel] [PATCH] doc: fix hardcode helper path
On Wed, Oct 23, 2013 at 04:49:28AM +0800, Amos Kong wrote: The install directory of qemu-bridge-helper is configurabled, but we used a fixed path in document. DEFAULT_BRIDGE_HELPER macro isn't available in texi mode, we always use /path/to/ prefix for dynamic path (eg: /path/to/image, /path/to/linux, etc). Signed-off-by: Amos Kong ak...@redhat.com Applied, thanks. --- qemu-options.hx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index 5dc8b75..8b94264 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1605,7 +1605,7 @@ to disable script execution. If running QEMU as an unprivileged user, use the network helper @var{helper} to configure the TAP interface. The default network -helper executable is @file{/usr/local/libexec/qemu-bridge-helper}. +helper executable is @file{/path/to/qemu-bridge-helper}. @option{fd}=@var{h} can be used to specify the handle of an already opened host TAP interface. @@ -1629,7 +1629,7 @@ qemu-system-i386 linux.img \ #launch a QEMU instance with the default network helper to #connect a TAP device to bridge br0 qemu-system-i386 linux.img \ - -net nic -net tap,helper=/usr/local/libexec/qemu-bridge-helper + -net nic -net tap,helper=/path/to/qemu-bridge-helper @end example @item -netdev bridge,id=@var{id}[,br=@var{bridge}][,helper=@var{helper}] @@ -1638,7 +1638,7 @@ Connect a host TAP network interface to a host bridge device. Use the network helper @var{helper} to configure the TAP interface and attach it to the bridge. The default network helper executable is -@file{/usr/local/libexec/qemu-bridge-helper} and the default bridge +@file{/path/to/qemu-bridge-helper} and the default bridge device is @file{br0}. Examples: -- 1.8.3.1
Re: [Qemu-devel] [PATCH] doc: fix hardcode helper path
On Wed, Oct 23, 2013 at 04:49:28AM +0800, Amos Kong wrote: The install directory of qemu-bridge-helper is configurabled, but we used a fixed path in document. DEFAULT_BRIDGE_HELPER macro isn't available in texi mode, we always use /path/to/ prefix for dynamic path (eg: /path/to/image, /path/to/linux, etc). Signed-off-by: Amos Kong ak...@redhat.com --- qemu-options.hx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Reviewed-by: Stefan Hajnoczi stefa...@redhat.com
[Qemu-devel] [PATCH] doc: fix hardcode helper path
The install directory of qemu-bridge-helper is configurabled, but we used a fixed path in document. DEFAULT_BRIDGE_HELPER macro isn't available in texi mode, we always use /path/to/ prefix for dynamic path (eg: /path/to/image, /path/to/linux, etc). Signed-off-by: Amos Kong ak...@redhat.com --- qemu-options.hx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index 5dc8b75..8b94264 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1605,7 +1605,7 @@ to disable script execution. If running QEMU as an unprivileged user, use the network helper @var{helper} to configure the TAP interface. The default network -helper executable is @file{/usr/local/libexec/qemu-bridge-helper}. +helper executable is @file{/path/to/qemu-bridge-helper}. @option{fd}=@var{h} can be used to specify the handle of an already opened host TAP interface. @@ -1629,7 +1629,7 @@ qemu-system-i386 linux.img \ #launch a QEMU instance with the default network helper to #connect a TAP device to bridge br0 qemu-system-i386 linux.img \ - -net nic -net tap,helper=/usr/local/libexec/qemu-bridge-helper + -net nic -net tap,helper=/path/to/qemu-bridge-helper @end example @item -netdev bridge,id=@var{id}[,br=@var{bridge}][,helper=@var{helper}] @@ -1638,7 +1638,7 @@ Connect a host TAP network interface to a host bridge device. Use the network helper @var{helper} to configure the TAP interface and attach it to the bridge. The default network helper executable is -@file{/usr/local/libexec/qemu-bridge-helper} and the default bridge +@file{/path/to/qemu-bridge-helper} and the default bridge device is @file{br0}. Examples: -- 1.8.3.1