NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-20 11:48:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix some missing parts in network code and schemas

Browse Source 
* 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
This commit is contained in:
Daniel Veillard 2009-07-02 14:02:18 +00:00
parent bc429a0e54
commit 1e4434d652
4 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -76,6 +76,7 @@ Patches have also been contributed by:
Federico Simoncelli <federico.simoncelli@gmail.com> Federico Simoncelli <federico.simoncelli@gmail.com>
Amy Griffis <amy.griffis@hp.com> Amy Griffis <amy.griffis@hp.com>
Henrik Persson E <henrik.e.persson@ericsson.com> Henrik Persson E <henrik.e.persson@ericsson.com>
Satoru SATOH <satoru.satoh@gmail.com>
[....send patches to get your name here....] [....send patches to get your name here....]

8
ChangeLog
View File

@ -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> 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, * src/node_device.c: fix an endless loop in node device XML dump,

14
docs/schemas/network.rng
View File

@ -1,6 +1,7 @@
<!-- A Relax NG schema for the libvirt network XML format --> <!-- A Relax NG schema for the libvirt network XML format -->
<element name="network" xmlns="http://relaxng.org/ns/structure/1.0" <element name="network" xmlns="http://relaxng.org/ns/structure/1.0"
datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"> datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
<interleave>
<!-- The name of the network, used to refer to it through the API <!-- The name of the network, used to refer to it through the API
and in virsh --> and in virsh -->
<element name="name"><text/></element> <element name="name"><text/></element>
@ -42,6 +43,11 @@
</optional> </optional>
</element> </element>
</optional> </optional>
<optional>
<element name="domain">
<attribute name="name"><text/></attribute>
</element>
</optional>
<optional> <optional>
<!-- The IP element sets up NAT'ing and an optional DHCP server <!-- The IP element sets up NAT'ing and an optional DHCP server
local to the host. --> local to the host. -->
@ -63,7 +69,15 @@
<attribute name="end"><text/></attribute> <attribute name="end"><text/></attribute>
</element> </element>
</zeroOrMore> </zeroOrMore>
<zeroOrMore>
<element name="host">
<attribute name="mac"><text/></attribute>
<attribute name="name"><text/></attribute>
<attribute name="ip"><text/></attribute>
</element>
</zeroOrMore>
</element> </element>
</element> </element>
</optional> </optional>
</interleave>
</element> </element>

3
src/network_conf.c
View File

@ -592,6 +592,9 @@ char *virNetworkDefFormat(virConnectPtr conn,
def->stp ? "on" : "off", def->stp ? "on" : "off",
def->delay); def->delay);
if (def->domain)
virBufferVSprintf(&buf, " <domain name='%s'/>\n", def->domain);
if (def->ipAddress || def->netmask) { if (def->ipAddress || def->netmask) {
virBufferAddLit(&buf, " <ip"); virBufferAddLit(&buf, " <ip");