External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 21:55:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

network: fix typos and docs

Browse Source
This commit is contained in:
Guannan Ren 2013-01-03 15:13:04 +08:00
parent e3a04455fa
commit 29d37818fb
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docs/formatdomain.html.in
View File

@ -2557,12 +2557,15 @@
virtualport types (and also to leave out certain attributes); at
domain startup time, a complete <code>&lt;virtualport&gt;</code>
element will be constructed by merging together the type and
attributes found in the which will be filled in from the network
or portgroup <code>&lt;virtualport&gt;</code>)
attributes defined in the network and the portgroup referenced
by the interface. The newly-constructed virtualport is a combination
of them. The attributes from lower virtualport can't make change
on the ones defined in higher virtualport.
Interface takes the highest priority, portgroup is lowest priority.
(<span class="since">Since 0.10.0</span>). For example, in order
to work properly with both an 802.1Qbh switch and an Open vSwitch
switch, you may choose to specify no type, but both
an <code>instanceid</code> (in case the switch is 802.1Qbh) and
an <code>profileid</code> (in case the switch is 802.1Qbh) and
an <code>interfaceid</code> (in case the switch is Open vSwitch)
(you may also omit the other attributes, such as managerid,
typeid, or profileid, to be filled in from the

4
src/conf/domain_conf.c
View File

@ -5020,7 +5020,7 @@ virDomainNetDefParseXML(virCapsPtr caps,
def->type == VIR_DOMAIN_NET_TYPE_INTERNAL &&
xmlStrEqual(cur->name, BAD_CAST "source")) {
internal = virXMLPropString(cur, "name");
} else if (!network &&
} else if (!bridge &&
def->type == VIR_DOMAIN_NET_TYPE_BRIDGE &&
xmlStrEqual(cur->name, BAD_CAST "source")) {
bridge = virXMLPropString(cur, "bridge");
@ -5054,7 +5054,7 @@ virDomainNetDefParseXML(virCapsPtr caps,
" <interface type='%s'>"), type);
goto error;
}
} else if (!network &&
} else if (!address &&
(def->type == VIR_DOMAIN_NET_TYPE_SERVER ||
def->type == VIR_DOMAIN_NET_TYPE_CLIENT ||
def->type == VIR_DOMAIN_NET_TYPE_MCAST) &&