From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42446) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ViNLk-0001Cn-GY for qemu-devel@nongnu.org; Mon, 18 Nov 2013 06:50:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ViNLd-0003fR-BE for qemu-devel@nongnu.org; Mon, 18 Nov 2013 06:50:40 -0500 Received: from mx1.redhat.com ([209.132.183.28]:9909) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ViNLd-0003f9-2X for qemu-devel@nongnu.org; Mon, 18 Nov 2013 06:50:33 -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 rAIBoWeo014234 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 18 Nov 2013 06:50:32 -0500 Date: Mon, 18 Nov 2013 13:53:46 +0200 From: "Michael S. Tsirkin" Message-ID: <1384775449-6693-3-git-send-email-mst@redhat.com> References: <1384775449-6693-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1384775449-6693-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL for-1.8 2/2] doc: fix hardcoded helper path List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Amos Kong , Stefan Hajnoczi From: Amos Kong 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 Reviewed-by: Stefan Hajnoczi Signed-off-by: Michael S. Tsirkin --- 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