|
 |
9ae3a8 |
From 4df441f7a38bf7bdbc625cfd7b79c7b9f0780adc Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Amos Kong <akong@redhat.com>
|
|
|
9ae3a8 |
Date: Thu, 21 Nov 2013 04:58:50 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 06/14] doc: fix hardcoded helper path
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Amos Kong <akong@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1385009930-5005-1-git-send-email-akong@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 55827
|
|
|
9ae3a8 |
O-Subject: [RHEL-7.0 qemu-kvm PATCH v2] doc: fix hardcoded helper path
|
|
|
9ae3a8 |
Bugzilla: 1016952
|
|
|
9ae3a8 |
RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Vlad Yasevich <vyasevic@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Bugzilla: 1016952
|
|
|
9ae3a8 |
Brew: http://brewweb.devel.redhat.com/brew/taskinfo?taskID=6621357
|
|
|
9ae3a8 |
Upstream: merged, we should parse C macros in texi mode in future
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
The install directory of qemu-bridge-helper is configurable,
|
|
|
9ae3a8 |
but we use a fixed path in the documentation.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
DEFAULT_BRIDGE_HELPER macro isn't available in texi mode,
|
|
|
9ae3a8 |
we should always use "/path/to/" prefix for dynamic paths
|
|
|
9ae3a8 |
(e.g.: /path/to/image, /path/to/linux, etc).
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Amos Kong <akong@redhat.com>
|
|
|
9ae3a8 |
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 420508fbba2a6e8eaff008715b5f7eff83f8e865)
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
v2: replace hardcode path prefix by '/path/to/'
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
qemu-options.hx | 6 +++---
|
|
|
9ae3a8 |
1 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
qemu-options.hx | 6 +++---
|
|
|
9ae3a8 |
1 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/qemu-options.hx b/qemu-options.hx
|
|
|
9ae3a8 |
index 3c60140..e3c5d67 100644
|
|
|
9ae3a8 |
--- a/qemu-options.hx
|
|
|
9ae3a8 |
+++ b/qemu-options.hx
|
|
|
9ae3a8 |
@@ -1593,7 +1593,7 @@ to disable script execution.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
If running QEMU as an unprivileged user, use the network helper
|
|
|
9ae3a8 |
@var{helper} to configure the TAP interface. The default network
|
|
|
9ae3a8 |
-helper executable is @file{/usr/local/libexec/qemu-bridge-helper}.
|
|
|
9ae3a8 |
+helper executable is @file{/path/to/qemu-bridge-helper}.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
@option{fd}=@var{h} can be used to specify the handle of an already
|
|
|
9ae3a8 |
opened host TAP interface.
|
|
|
9ae3a8 |
@@ -1617,7 +1617,7 @@ qemu-system-i386 linux.img \
|
|
|
9ae3a8 |
#launch a QEMU instance with the default network helper to
|
|
|
9ae3a8 |
#connect a TAP device to bridge br0
|
|
|
9ae3a8 |
qemu-system-i386 linux.img \
|
|
|
9ae3a8 |
- -net nic -net tap,"helper=/usr/local/libexec/qemu-bridge-helper"
|
|
|
9ae3a8 |
+ -net nic -net tap,"helper=/path/to/qemu-bridge-helper"
|
|
|
9ae3a8 |
@end example
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
@item -netdev bridge,id=@var{id}[,br=@var{bridge}][,helper=@var{helper}]
|
|
|
9ae3a8 |
@@ -1626,7 +1626,7 @@ Connect a host TAP network interface to a host bridge device.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Use the network helper @var{helper} to configure the TAP interface and
|
|
|
9ae3a8 |
attach it to the bridge. The default network helper executable is
|
|
|
9ae3a8 |
-@file{/usr/local/libexec/qemu-bridge-helper} and the default bridge
|
|
|
9ae3a8 |
+@file{/path/to/qemu-bridge-helper} and the default bridge
|
|
|
9ae3a8 |
device is @file{br0}.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Examples:
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.1
|
|
|
9ae3a8 |
|