[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [libvirt] [PATCH 1/3] network: fix typos and docs



On 01/08/2013 07:14 AM, Eric Blake wrote:
On 01/03/2013 12:13 AM, Guannan Ren wrote:
---
  docs/formatdomain.html.in | 9 ++++++---
  src/conf/domain_conf.c    | 4 ++--
  2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 94df6f8..45d7593 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -2546,12 +2546,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
s/make change to/change/

    Fixed.


+++ b/src/conf/domain_conf.c
@@ -4994,7 +4994,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");
@@ -5028,7 +5028,7 @@ virDomainNetDefParseXML(virCapsPtr caps,
                                       " <interface type='%s'>"), type);
                      goto error;
                  }
-            } else if (!network &&
+            } else if (!address &&
Looks okay to me, but you might want to get Laine's ACK as well.


   Thanks for review.
   I am gonna push 1/3 and 2/3 and make a new patchset involved 3/3 in

   Guannan


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]