libvirt/tests/xml2vmxdata/xml2vmx-annotation.xml

<domain type='vmware'>
  <name>annotation</name>
  <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid>
  <description>Some |text| to test the &quot;escaping&quot;: ||&quot;&quot;||&quot;| Unescaped!</description>
  <memory unit='KiB'>4096</memory>
  <os>
    <type>hvm</type>
  </os>
</domain>
esx: Map the .vmx annotation to the domain XML description Take care of escaping '"' and '\|' (the escape character). Add tests for this. 2010-08-27 23:23:49 +08:00			`<domain type='vmware'>`
			`<name>annotation</name>`
			`<uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid>`
			`<description>Some \|text\| to test the "escaping": \|\|""\|\|"\| Unescaped!</description>`
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 08:48:38 +08:00			`<memory unit='KiB'>4096</memory>`
esx: Map the .vmx annotation to the domain XML description Take care of escaping '"' and '\|' (the escape character). Add tests for this. 2010-08-27 23:23:49 +08:00			`<os>`
			`<type>hvm</type>`
			`</os>`
			`</domain>`