libvirt/tests/xml2sexprdata/xml2sexpr-disk-block-shareable.xml

<domain type='xen'>
  <name>pvtest</name>
  <uuid>49a0c6ffc066539264983632d093c2e7</uuid>
  <bootloader>/usr/bin/pygrub</bootloader>
  <os>
    <type>linux</type>
    <kernel>/var/lib/xen/boot_kernel.BCkYBN</kernel>
    <initrd>/var/lib/xen/boot_ramdisk.sjOK9_</initrd>
    <cmdline>ro root=/dev/VolGroup00/LogVol00</cmdline>
  </os>
  <currentMemory unit='KiB'>393216</currentMemory>
  <memory unit='KiB'>524288</memory>
  <vcpu>1</vcpu>
  <on_poweroff>destroy</on_poweroff>
  <on_reboot>restart</on_reboot>
  <on_crash>restart</on_crash>
  <devices>
    <disk type='file' device='disk'>
      <driver name='tap' type='aio'/>
      <source file='/var/lib/xen/images/rhel5pv.img'/>
      <target dev='xvda'/>
      <shareable/>
    </disk>
    <interface type='bridge'>
      <mac address='00:16:3e:23:9e:eb'/>
      <source bridge='xenbr0'/>
      <script path='vif-bridge'/>
    </interface>
    <console/>
  </devices>
</domain>
* tests/sexpr2xmltest.c tests/xml2sexprtest.c: warn before exiting if the path environment variable is missing, add the tests for <shareable/> from/to w! ode for disk * tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.sexpr tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml tests/xml2sexprdata/xml2sexpr-disk-block-shareable.sexpr tests/xml2sexprdata/xml2sexpr-disk-block-shareable.xml: the new tests data Daniel 2007-11-20 10:05:45 +00:00			`<domain type='xen'>`
			`<name>pvtest</name>`
			`<uuid>49a0c6ffc066539264983632d093c2e7</uuid>`
			`<bootloader>/usr/bin/pygrub</bootloader>`
			`<os>`
			`<type>linux</type>`
			`<kernel>/var/lib/xen/boot_kernel.BCkYBN</kernel>`
			`<initrd>/var/lib/xen/boot_ramdisk.sjOK9_</initrd>`
			`<cmdline>ro root=/dev/VolGroup00/LogVol00</cmdline>`
			`</os>`
xml: output memory unit for clarity Make it obvious to 'dumpxml' readers what unit we are using, since our default of KiB for memory (1024) differs from qemu's default of MiB; and differs from our use of bytes for storage. Tests were updated via: $ find tests/data tests/out -name '.xml' \| \ xargs sed -i 's/<\(memory\\|currentMemory\\|hard_limit\\|soft_limit\\|min_guarantee\\|swap_hard_limit\)>/<\1 unit='"'KiB'>/" $ find tests/data tests/out -name '.xml' \| \ xargs sed -i 's/<\(capacity\\|allocation\\|available\)>/<\1 unit='"'bytes'>/" followed by a few fixes for the stragglers. Note that with this patch, the RNG for <memory> still forbids validation of anything except unit='KiB', since the code silently ignores the attribute; a later patch will expand <memory> to allow scaled input in the code and update the RNG to match. * docs/schemas/basictypes.rng (unit): Add 'bytes'. (scaledInteger): New define. * docs/schemas/storagevol.rng (sizing): Use it. * docs/schemas/storagepool.rng (sizing): Likewise. * docs/schemas/domaincommon.rng (memoryKBElement): New define; use for memory elements. * src/conf/storage_conf.c (virStoragePoolDefFormat) (virStorageVolDefFormat): Likewise. * src/conf/domain_conf.h (_virDomainDef): Document unit used internally. * src/conf/storage_conf.h (_virStoragePoolDef, _virStorageVolDef): Likewise. * tests/data/.xml: Update all tests. * tests/out/.xml: Likewise. * tests/define-dev-segfault: Likewise. * tests/openvzutilstest.c (testReadNetworkConf): Likewise. * tests/qemuargv2xmltest.c (blankProblemElements): Likewise. 2012-02-23 00:48:38 +00:00			`<currentMemory unit='KiB'>393216</currentMemory>`
			`<memory unit='KiB'>524288</memory>`
* tests/sexpr2xmltest.c tests/xml2sexprtest.c: warn before exiting if the path environment variable is missing, add the tests for <shareable/> from/to w! ode for disk * tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.sexpr tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml tests/xml2sexprdata/xml2sexpr-disk-block-shareable.sexpr tests/xml2sexprdata/xml2sexpr-disk-block-shareable.xml: the new tests data Daniel 2007-11-20 10:05:45 +00:00			`<vcpu>1</vcpu>`
			`<on_poweroff>destroy</on_poweroff>`
			`<on_reboot>restart</on_reboot>`
			`<on_crash>restart</on_crash>`
			`<devices>`
			`<disk type='file' device='disk'>`
			`<driver name='tap' type='aio'/>`
			`<source file='/var/lib/xen/images/rhel5pv.img'/>`
			`<target dev='xvda'/>`
			`<shareable/>`
			`</disk>`
			`<interface type='bridge'>`
			`<mac address='00:16:3e:23:9e:eb'/>`
			`<source bridge='xenbr0'/>`
			`<script path='vif-bridge'/>`
			`</interface>`
			`<console/>`
			`</devices>`
			`</domain>`