[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL for-1.8 2/2] doc: fix hardcoded helper path
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL for-1.8 2/2] doc: fix hardcoded helper path |
Date: |
Mon, 18 Nov 2013 13:53:46 +0200 |
From: Amos Kong <address@hidden>
The install directory of qemu-bridge-helper is configurable,
but we use a fixed path in the documentation.
DEFAULT_BRIDGE_HELPER macro isn't available in texi mode,
we should always use "/path/to/" prefix for dynamic paths
(e.g.: /path/to/image, /path/to/linux, etc).
Signed-off-by: Amos Kong <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
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}.
@address@hidden 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,address@hidden,address@hidden,address@hidden
@@ -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
address@hidden/usr/local/libexec/qemu-bridge-helper} and the default bridge
address@hidden/path/to/qemu-bridge-helper} and the default bridge
device is @file{br0}.
Examples:
--
MST
- Re: [Qemu-devel] [PULL for-1.8 1/2] pc: disable pci-info, (continued)
- Re: [Qemu-devel] [PULL for-1.8 1/2] pc: disable pci-info, Laszlo Ersek, 2013/11/26
- Re: [Qemu-devel] [PULL for-1.8 1/2] pc: disable pci-info, Michael S. Tsirkin, 2013/11/26
- Re: [Qemu-devel] [PULL for-1.8 1/2] pc: disable pci-info, Gerd Hoffmann, 2013/11/26
- Re: [Qemu-devel] [PULL for-1.8 1/2] pc: disable pci-info, Michael S. Tsirkin, 2013/11/26
- Re: [Qemu-devel] [PULL for-1.8 1/2] pc: disable pci-info, Igor Mammedov, 2013/11/26
- Re: [Qemu-devel] [PULL for-1.8 1/2] pc: disable pci-info, Gerd Hoffmann, 2013/11/26
- Re: [Qemu-devel] [PULL for-1.8 1/2] pc: disable pci-info, Michael S. Tsirkin, 2013/11/26
- Re: [Qemu-devel] [PULL for-1.8 1/2] pc: disable pci-info, Gerd Hoffmann, 2013/11/26
- Re: [Qemu-devel] [PULL for-1.8 1/2] pc: disable pci-info, Laszlo Ersek, 2013/11/26
- Re: [Qemu-devel] [PULL for-1.8 1/2] pc: disable pci-info, Igor Mammedov, 2013/11/26
[Qemu-devel] [PULL for-1.8 2/2] doc: fix hardcoded helper path,
Michael S. Tsirkin <=
Re: [Qemu-devel] [PULL for-1.8 0/2] pc last minute fixes for 1.8, Eric Blake, 2013/11/18