diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index fb25cb8383..2c5c456320 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2857,6 +2857,46 @@ qemu-kvm -net nic,model=? /dev/null Since 0.9.4
++ ... + <devices> + <interface type='bridge'> + <vlan> + <tag id='42'/> + </vlan> + <source bridge='ovsbr0'/> + <virtualport type='openvswitch'> + <parameters interfaceid='09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f'/> + </virtualport> + </interface> + <devices> + ...+ +
+ If (and only if) the network connection used by the guest
+ supports vlan tagging transparent to the guest, an
+ optional <vlan>
element can specify one or
+ more vlan tags to apply to the guest's network
+ traffic Since 0.10.0. (openvswitch
+ and type='hostdev' SR-IOV interfaces do support transparent vlan
+ tagging of guest traffic; everything else, including standard
+ linux bridges and libvirt's own virtual networks, do not
+ support it. 802.1Qbh (vn-link) and 802.1Qbg (VEPA) switches
+ provide their own way (outside of libvirt) to tag guest traffic
+ onto specific vlans.) To allow for specification of multiple
+ tags (in the case of vlan trunking), a
+ subelement, <tag%gt;
, specifies which vlan tag
+ to use (for example: <tag id='42'/>
. If an
+ interface has more than one <vlan>
element
+ defined, it is assumed that the user wants to do VLAN trunking
+ using all the specified tags. In the case that vlan trunking
+ with a single tag is desired, the optional
+ attribute trunk='yes'
can be added to the toplevel
+ vlan element.
+
... diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index a010cbd217..ed9f7a9db1 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -306,6 +306,56 @@ Since 0.9.4 +Setting VLAN tag (on supported network types only)
+ ++ ... + <devices> + <interface type='bridge'> + <vlan trunk='yes'> + <tag id='42'/> + <tag id='47'/> + </vlan> + <source bridge='ovsbr0'/> + <virtualport type='openvswitch'> + <parameters interfaceid='09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f'/> + </virtualport> + </interface> + <devices> + ...+ ++ If (and only if) the network type supports vlan tagging + transparent to the guest, an optional
+<vlan>
+ element can specify one or more vlan tags to apply to the + traffic of all guests using this + network Since 0.10.0. (openvswitch + and type='hostdev' SR-IOV networks do support transparent vlan + tagging of guest traffic; everything else, including standard + linux bridges and libvirt's own virtual networks, do not + support it. 802.1Qbh (vn-link) and 802.1Qbg (VEPA) switches + provide their own way (outside of libvirt) to tag guest traffic + onto specific vlans.) As expected, thetag
+ attribute specifies which vlan tag to use. If a network has more + than one<vlan>
element defined, it is + assumed that the user wants to do VLAN trunking using all the + specified tags. In the case that vlan trunking with a single tag + is desired, the optional attributetrunk='yes'
can + be added to the vlan element. ++
+<vlan>
elements can also be specified in + a<portgroup>
element, as well as directly in + a domain's<interface>
element. In the case + that a vlan tag is specified in multiple locations, the setting + in<interface>
takes precedence, followed by + the setting in the<portgroup>
selected by + the interface config. The<vlan>
+ in<network>
will be selected only if none is + given in<portgroup>
+ or<interface>
. +Portgroups
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 767fccda08..4903ca69e3 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1713,6 +1713,9 @@+ + +