From: Daniel Veillard <veillard@redhat.com>
Date: Thu, 2 Jul 2009 14:02:18 +0000 (+0000)
Subject: Fix some missing parts in network code and schemas
X-Git-Tag: LIBVIRT_0_6_5~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e4434d652fd0014b3332c5a82aa5bbb0cf0907c;p=thirdparty%2Flibvirt.git

Fix some missing parts in network code and schemas
* docs/schemas/network.rng: fix the network schemas to match
  new accepted elements, patch by Satoru SATOH
* src/network_conf.c: fix network driver to save the domain name
  in XML if present, patch by Satoru SATOH
* AUTHORS: adding Satoru SATOH
Daniel
---

diff --git a/AUTHORS b/AUTHORS
index 4fbfb20e65..dd537e6d75 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -76,6 +76,7 @@ Patches have also been contributed by:
   Federico Simoncelli  <federico.simoncelli@gmail.com>
   Amy Griffis          <amy.griffis@hp.com>
   Henrik Persson E     <henrik.e.persson@ericsson.com>
+  Satoru SATOH         <satoru.satoh@gmail.com>
 
   [....send patches to get your name here....]
 
diff --git a/ChangeLog b/ChangeLog
index 129a2ccc7a..3f89a74357 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Jul  2 15:58:09 CEST 2009 Daniel Veillard <veillard@redhat.com>
+
+	* docs/schemas/network.rng: fix the network schemas to match
+	  new accepted elements, patch by Satoru SATOH
+	* src/network_conf.c: fix network driver to save the domain name
+	  in XML if present, patch by Satoru SATOH
+	* AUTHORS: adding Satoru SATOH
+
 Wed Jul  1 23:29:33 CEST 2009 Daniel Veillard <veillard@redhat.com>
 
 	* src/node_device.c: fix an endless loop in node device XML dump,
diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng
index 34c0163185..a4281a52ff 100644
--- a/docs/schemas/network.rng
+++ b/docs/schemas/network.rng
@@ -1,6 +1,7 @@
 <!-- A Relax NG schema for the libvirt network XML format -->
 <element name="network" xmlns="http://relaxng.org/ns/structure/1.0"
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <interleave>
   <!-- The name of the network, used to refer to it through the API
        and in virsh -->
   <element name="name"><text/></element>
@@ -42,6 +43,11 @@
       </optional>
     </element>
   </optional>
+  <optional>
+    <element name="domain">
+      <attribute name="name"><text/></attribute>
+    </element>
+  </optional>
   <optional>
     <!-- The IP element sets up NAT'ing and an optional DHCP server
          local to the host. -->
@@ -63,7 +69,15 @@
             <attribute name="end"><text/></attribute>
           </element>
         </zeroOrMore>
+        <zeroOrMore>
+          <element name="host">
+            <attribute name="mac"><text/></attribute>
+            <attribute name="name"><text/></attribute>
+            <attribute name="ip"><text/></attribute>
+          </element>
+        </zeroOrMore>
       </element>
     </element>
   </optional>
+  </interleave>
 </element>
diff --git a/src/network_conf.c b/src/network_conf.c
index 1e0cbb8206..1b50b84e8a 100644
--- a/src/network_conf.c
+++ b/src/network_conf.c
@@ -592,6 +592,9 @@ char *virNetworkDefFormat(virConnectPtr conn,
                       def->stp ? "on" : "off",
                       def->delay);
 
+    if (def->domain)
+        virBufferVSprintf(&buf, "  <domain name='%s'/>\n", def->domain);
+
     if (def->ipAddress || def->netmask) {
         virBufferAddLit(&buf, "  <ip");