From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38007) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VYitZ-0006ni-4x for qemu-devel@nongnu.org; Tue, 22 Oct 2013 16:49:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VYitT-00046i-4r for qemu-devel@nongnu.org; Tue, 22 Oct 2013 16:49:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57332) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VYitS-00046b-SA for qemu-devel@nongnu.org; Tue, 22 Oct 2013 16:49:35 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r9MKnXsQ023116 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 22 Oct 2013 16:49:33 -0400 From: Amos Kong Date: Wed, 23 Oct 2013 04:49:28 +0800 Message-Id: <1382474968-2486-1-git-send-email-akong@redhat.com> Subject: [Qemu-devel] [PATCH] doc: fix hardcode helper path List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: armbru@redhat.com, stefanha@redhat.com 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 --- 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