qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Amos Kong <akong@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>
Subject: [Qemu-devel] [PULL for-1.8 2/2] doc: fix hardcoded helper path
Date: Mon, 18 Nov 2013 13:53:46 +0200	[thread overview]
Message-ID: <1384775449-6693-3-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1384775449-6693-1-git-send-email-mst@redhat.com>

From: Amos Kong <akong@redhat.com>

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 <akong@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@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:
-- 
MST

  parent reply	other threads:[~2013-11-18 11:50 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-18 11:53 [Qemu-devel] [PULL for-1.8 0/2] pc last minute fixes for 1.8 Michael S. Tsirkin
2013-11-18 11:53 ` [Qemu-devel] [PULL for-1.8 1/2] pc: disable pci-info Michael S. Tsirkin
2013-11-26  8:12   ` Laszlo Ersek
2013-11-26  9:10     ` Michael S. Tsirkin
2013-11-26 11:00       ` Gerd Hoffmann
2013-11-26 14:04         ` Michael S. Tsirkin
2013-11-26 14:22           ` Laszlo Ersek
2013-11-26 15:04             ` Michael S. Tsirkin
2013-11-26 15:42             ` Gerd Hoffmann
2013-11-26 15:48               ` Michael S. Tsirkin
2013-11-26 18:26               ` Igor Mammedov
2013-11-27  6:15                 ` Michael S. Tsirkin
2013-11-26 15:20           ` Gerd Hoffmann
2013-11-26 15:28             ` Michael S. Tsirkin
2013-11-26 15:59               ` Gerd Hoffmann
2013-11-27  6:20                 ` Michael S. Tsirkin
2013-11-26 14:11       ` Laszlo Ersek
2013-11-26 18:58         ` Igor Mammedov
2013-11-18 11:53 ` Michael S. Tsirkin [this message]
2013-11-18 15:06 ` [Qemu-devel] [PULL for-1.8 0/2] pc last minute fixes for 1.8 Eric Blake
2013-11-18 15:17   ` Michael S. Tsirkin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1384775449-6693-3-git-send-email-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=akong@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).