View | Details | Raw Unified | Return to bug 30383
Collapse All | Expand All

(-)file_not_specified_in_diff (-4 / +4 lines)
Line  Link Here
0
-- qemu.1      2014-10-07 23:34:56.000000000 +0600
0
++ qemu.1.new  2014-10-07 23:37:04.687568208 +0600
Lines 1303-1309 Link Here
1303
.Sp
1303
.Sp
1304
If running \s-1QEMU\s0 as an unprivileged user, use the network helper
1304
If running \s-1QEMU\s0 as an unprivileged user, use the network helper
1305
\&\fIhelper\fR to configure the \s-1TAP\s0 interface. The default network
1305
\&\fIhelper\fR to configure the \s-1TAP\s0 interface. The default network
1306
helper executable is \fI/usr/local/libexec/qemu\-bridge\-helper\fR.
1306
helper executable is \fI/usr/libexec/qemu\-bridge\-helper\fR.
1307
.Sp
1307
.Sp
1308
\&\fBfd\fR=\fIh\fR can be used to specify the handle of an already
1308
\&\fBfd\fR=\fIh\fR can be used to specify the handle of an already
1309
opened host \s-1TAP\s0 interface.
1309
opened host \s-1TAP\s0 interface.
Lines 1327-1333 Link Here
1327
\&        #launch a QEMU instance with the default network helper to
1327
\&        #launch a QEMU instance with the default network helper to
1328
\&        #connect a TAP device to bridge br0
1328
\&        #connect a TAP device to bridge br0
1329
\&        qemu\-system\-i386 linux.img \e
1329
\&        qemu\-system\-i386 linux.img \e
1330
\&        \-net nic \-net tap,"helper=/usr/local/libexec/qemu\-bridge\-helper"
1330
\&        \-net nic \-net tap,"helper=/usr/libexec/qemu\-bridge\-helper"
1331
.Ve
1331
.Ve
1332
.IP "\fB\-netdev bridge,id=\fR\fIid\fR\fB[,br=\fR\fIbridge\fR\fB][,helper=\fR\fIhelper\fR\fB]\fR" 4
1332
.IP "\fB\-netdev bridge,id=\fR\fIid\fR\fB[,br=\fR\fIbridge\fR\fB][,helper=\fR\fIhelper\fR\fB]\fR" 4
1333
.IX Item "-netdev bridge,id=id[,br=bridge][,helper=helper]"
1333
.IX Item "-netdev bridge,id=id[,br=bridge][,helper=helper]"
Lines 1339-1345 Link Here
1339
.Sp
1339
.Sp
1340
Use the network helper \fIhelper\fR to configure the \s-1TAP\s0 interface and
1340
Use the network helper \fIhelper\fR to configure the \s-1TAP\s0 interface and
1341
attach it to the bridge. The default network helper executable is
1341
attach it to the bridge. The default network helper executable is
1342
\&\fI/usr/local/libexec/qemu\-bridge\-helper\fR and the default bridge
1342
\&\fI/usr/libexec/qemu\-bridge\-helper\fR and the default bridge
1343
device is \fIbr0\fR.
1343
device is \fIbr0\fR.
1344
.Sp
1344
.Sp
1345
Examples:
1345
Examples:

Return to bug 30383