summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkn <kn@cvs.openbsd.org>2021-03-01 14:27:45 +0000
committerkn <kn@cvs.openbsd.org>2021-03-01 14:27:45 +0000
commit1239883c4f820cf3d6bd8c1cc5ac2b7340c1e330 (patch)
treec84354510d9804c254bf221281ff8524282c7c8a
parentf34d4b2beb1d31a0fd5b37fc76cbf03834be8a7d (diff)
Document veb(4) support
Feedback jmc OK dlg
-rw-r--r--usr.sbin/vmctl/vmctl.88
-rw-r--r--usr.sbin/vmd/vm.conf.512
2 files changed, 11 insertions, 9 deletions
diff --git a/usr.sbin/vmctl/vmctl.8 b/usr.sbin/vmctl/vmctl.8
index 6a583d5b235..d36170e3e24 100644
--- a/usr.sbin/vmctl/vmctl.8
+++ b/usr.sbin/vmctl/vmctl.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: vmctl.8,v 1.72 2020/02/16 11:03:25 kn Exp $
+.\" $OpenBSD: vmctl.8,v 1.73 2021/03/01 14:27:44 kn Exp $
.\"
.\" Copyright (c) 2015 Mike Larkin <mlarkin@openbsd.org>
.\"
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: February 16 2020 $
+.Dd $Mdocdate: March 1 2021 $
.Dt VMCTL 8
.Os
.Sh NAME
@@ -280,7 +280,7 @@ This tap/vio interface mapping
allows guest network traffic to be manipulated by the host.
Any valid host-side interface configuration may be performed on these
tap interfaces, such as bridging (via
-.Xr bridge 4 ) ,
+.Xr veb 4 ) ,
or using
.Xr pf 4
nat-to rules to create private or host-side NATed networks, as desired.
@@ -423,9 +423,9 @@ Terminate VM number 1:
# vmctl stop 1
.Ed
.Sh SEE ALSO
-.Xr bridge 4 ,
.Xr pf 4 ,
.Xr tap 4 ,
+.Xr veb 4 ,
.Xr vio 4 ,
.Xr vmm 4 ,
.Xr vm.conf 5 ,
diff --git a/usr.sbin/vmd/vm.conf.5 b/usr.sbin/vmd/vm.conf.5
index 1891580ee57..e32ab65b16d 100644
--- a/usr.sbin/vmd/vm.conf.5
+++ b/usr.sbin/vmd/vm.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: vm.conf.5,v 1.55 2020/09/23 19:18:18 martijn Exp $
+.\" $OpenBSD: vm.conf.5,v 1.56 2021/03/01 14:27:44 kn Exp $
.\"
.\" Copyright (c) 2015 Mike Larkin <mlarkin@openbsd.org>
.\" Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org>
@@ -15,7 +15,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: September 23 2020 $
+.Dd $Mdocdate: March 1 2021 $
.Dt VM.CONF 5
.Os
.Sh NAME
@@ -376,9 +376,10 @@ Set the owner to the specified group.
.Sh SWITCH CONFIGURATION
A virtual switch allows VMs to communicate with other network interfaces on the
host system via either
-.Xr bridge 4
+.Xr bridge 4 ,
+.Xr switch 4
or
-.Xr switch 4 .
+.Xr veb 4 .
The network interface for each virtual switch defined in
.Nm
is pre-configured using
@@ -435,9 +436,10 @@ as described in
.Xr ifconfig 8 .
.It Cm interface Ar name
Set the
+.Xr bridge 4 ,
.Xr switch 4
or
-.Xr bridge 4
+.Xr veb 4
network interface of this switch.
If the type is changed to
.Ar switch0 ,