From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:38849)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1ViN6f-0003PF-QS
	for qemu-devel@nongnu.org; Mon, 18 Nov 2013 06:35:11 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1ViN6Z-0006rj-1J
	for qemu-devel@nongnu.org; Mon, 18 Nov 2013 06:35:05 -0500
Received: from mx1.redhat.com ([209.132.183.28]:50075)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1ViN6Y-0006rM-Pm
	for qemu-devel@nongnu.org; Mon, 18 Nov 2013 06:34:58 -0500
Received: from int-mx09.intmail.prod.int.phx2.redhat.com
	(int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22])
	by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rAIBYv11004430
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <qemu-devel@nongnu.org>; Mon, 18 Nov 2013 06:34:57 -0500
Date: Mon, 18 Nov 2013 13:38:10 +0200
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20131118113810.GA5393@redhat.com>
References: <1382474968-2486-1-git-send-email-akong@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1382474968-2486-1-git-send-email-akong@redhat.com>
Subject: Re: [Qemu-devel] [PATCH] doc: fix hardcode helper path
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Amos Kong <akong@redhat.com>
Cc: qemu-devel@nongnu.org, stefanha@redhat.com, armbru@redhat.com

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 <akong@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
>