network: fix typos and docs

diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index f3b35f933bf9d9b130f685bf1edfbe7caaa70d12..90f8abefde1041a7fd5d8d53e6f8ecb7ea7349d2 100644 (file)
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -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

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index d56c333a60f7863eddab21b4a6d44b1f6d3324b4..6feded4042bf2e638bfc9d23585ad2e70428e591 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -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) &&