> On 27 Feb 2021, at 10:11, Klemens Nanni <[email protected]> wrote:
>
> On Sat, Feb 27, 2021 at 09:44:03AM +1000, David Gwynne wrote:
>>
>>
>>> On 27 Feb 2021, at 7:50 am, Klemens Nanni <[email protected]> wrote:
>>>
>>> On Sat, Feb 27, 2021 at 07:30:56AM +1000, David Gwynne wrote:
>>>> i think this is enough to let vmd wire guests up to veb interfaces.
>>> But please update vm.conf(5) to mention veb(4) and vport(4) in as well
>>> SWITCH CONFIGURATION.
>>
>> How would you fit wording about vport(4) in?
> I was too vague, it'd be just veb(4), I guess.
> I wouldn't go into any of the bridge/switch driver's specific
> configuration in vmd(8), i.e. explicitly omit any mention of vether(4)
> or vport(4).
>
> How about this (quietly moving vmctl(8) from bridge(4) to veb(4) while
> at it...)
reads good to me, so ok. i'll put the .c bits in now.
>
>
> Index: vmd/vm.conf.5
> ===================================================================
> RCS file: /cvs/src/usr.sbin/vmd/vm.conf.5,v
> retrieving revision 1.55
> diff -u -p -r1.55 vm.conf.5
> --- vmd/vm.conf.5 23 Sep 2020 19:18:18 -0000 1.55
> +++ vmd/vm.conf.5 27 Feb 2021 00:07:20 -0000
> @@ -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 ,
> Index: vmctl/vmctl.8
> ===================================================================
> RCS file: /cvs/src/usr.sbin/vmctl/vmctl.8,v
> retrieving revision 1.72
> diff -u -p -r1.72 vmctl.8
> --- vmctl/vmctl.8 16 Feb 2020 11:03:25 -0000 1.72
> +++ vmctl/vmctl.8 27 Feb 2021 00:07:41 -0000
> @@ -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,7 +423,7 @@ Terminate VM number 1:
> # vmctl stop 1
> .Ed
> .Sh SEE ALSO
> -.Xr bridge 4 ,
> +.Xr veb 4 ,
> .Xr pf 4 ,
> .Xr tap 4 ,
> .Xr vio 4 ,
