← Back to branch summary

~serge-hallyn/ubuntu/raring/libvirt/libvirt-hugepages

« back to all changes in this revision

Viewing changes to docs/schemas/network.rng

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-05-13 15:44:12 UTC
  • mfrom: (1.2.13)
  • Revision ID: package-import@ubuntu.com-20120513154412-fgmn5sxqdzgnzlx3
Tags: 0.9.12-0ubuntu1
* New upstream version:
  * Synchronize with debian packaging:
    - debian/control: Update build depends.
    - debian/libvirt-bin.postrm: Cleanup /var/log/libvirt
      on purge.
    - Bump standards verson (no changes).
    - debian/patches/Don-t-fail-if-we-can-t-setup-avahi.patch: Added
  * Dropped patches:
    - debian/patches/Debianize-libvirt-guests.patch
    - debian/patches/rewrite-lxc-controller-eof-handling-yet-again
    - debian/patches/ubuntu/libnl13.patch
    - debian/patches/ubuntu/fix-lxc-startup-error.patch
    - debian/patches/ubuntu/fix-bridge-fd.patch
    - debian/patches/ubuntu/skip-labelling-network-disks.patch
    - debian/patches/ubuntu/xen-xend-shutdown-detection.patch
    - debian/patches/ubuntu/xen-config-no-vfb-for-hvm.patch
    - debian/patches/debian/Disable-daemon-start-test.patch
    - debian/patches/debian/Disable-gnulib-s-test-nonplocking-pipe.sh.patch
    - debian/patches/ubuntu/9006-default-config-test-case.patch
    - debian/patches/fix-block-migration.patch
    - debian/patches/ubuntu/9022-qemu-unescape-HMP-commands-before-converting-them-to.patch
    - debian/patches/ubuntu/9023-qemu-change-rbd-auth_supported-separation-character-.patch
    - debian/patches/ubuntu/9024-qemu-allow-snapshotting-of-sheepdog-and-rbd-disks.patch
    - debian/patches/9025-qemu-change-rbd-auth_supported-separation-character-.patch
    - debian/patches/ubuntu/arm-gcc-workaround.patch
  * Rediffed:
    - debian/patches/Allow-libvirt-group-to-access-the-socket.patch
    - debian/patches/Disable-failing-virnetsockettest.patch
    - debian/patches/dnsmasq-as-priv-user
    - debian/patches/9002-better_default_uri_virsh.patch
  * debian/control: Add libnl-route-3-dev ass a build depends.
  * debian/patches/libnl3-build-fix.patch: Fix build with libnl3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
docs/schemas/network.rng
57
57
        <!-- <mac> element -->
58
58
        <optional>
59
59
          <element name="mac">
60
 
            <attribute name="address"><ref name="macAddr"/></attribute>
 
60
            <attribute name="address"><ref name="uniMacAddr"/></attribute>
61
61
            <empty/>
62
62
          </element>
63
63
        </optional>
85
85
                </choice>
86
86
              </attribute>
87
87
            </optional>
88
 
            <zeroOrMore>
89
 
              <element name='interface'>
90
 
                <attribute name='dev'>
91
 
                  <ref name='deviceName'/>
92
 
                </attribute>
93
 
              </element>
94
 
            </zeroOrMore>
 
88
            <interleave>
 
89
              <zeroOrMore>
 
90
                <element name='interface'>
 
91
                  <attribute name='dev'>
 
92
                    <ref name='deviceName'/>
 
93
                  </attribute>
 
94
                </element>
 
95
              </zeroOrMore>
 
96
              <optional>
 
97
                <element name='pf'>
 
98
                  <attribute name='dev'>
 
99
                    <ref name='deviceName'/>
 
100
                  </attribute>
 
101
                </element>
 
102
              </optional>
 
103
            </interleave>
95
104
          </element>
96
105
        </optional>
97
106
 
138
147
                </element>
139
148
              </zeroOrMore>
140
149
              <zeroOrMore>
 
150
                <element name="srv">
 
151
                  <attribute name="service"><text/></attribute>
 
152
                  <attribute name="protocol"><ref name="protocol"/></attribute>
 
153
                  <optional>
 
154
                    <attribute name="domain"><ref name="dnsName"/></attribute>
 
155
                    <attribute name="target"><text/></attribute>
 
156
                    <attribute name="port"><ref name="unsignedShort"/></attribute>
 
157
                    <attribute name="priority"><ref name="unsignedShort"/></attribute>
 
158
                    <attribute name="weight"><ref name="unsignedShort"/></attribute>
 
159
                  </optional>
 
160
                </element>
 
161
              </zeroOrMore>
 
162
              <zeroOrMore>
141
163
                <element name="host">
142
164
                  <attribute name="ip"><ref name="ipv4Addr"/></attribute>
143
165
                  <oneOrMore>
196
218
                </zeroOrMore>
197
219
                <zeroOrMore>
198
220
                  <element name="host">
199
 
                    <attribute name="mac"><ref name="macAddr"/></attribute>
 
221
                    <attribute name="mac"><ref name="uniMacAddr"/></attribute>
200
222
                    <attribute name="name"><text/></attribute>
201
223
                    <attribute name="ip"><ref name="ipv4Addr"/></attribute>
202
224
                  </element>
216
238
      </interleave>
217
239
    </element>
218
240
  </define>
219
 
 
220
 
  <define name='addr-family'>
221
 
    <data type='string'>
222
 
      <param name="pattern">(ipv4)|(ipv6)</param>
223
 
    </data>
224
 
  </define>
225
 
 
226
241
</grammar>