libvirt/tests/xml2sexprdata/xml2sexpr-boot-grub.xml

<domain type='xen' id='15'>
  <name>pvtest</name>
  <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>
  <os>
    <type>linux</type>
    <kernel>/usr/lib/xen/boot/pv-grub-x86_64.gz</kernel>
    <cmdline>(hd0,0)/grub/menu.lst</cmdline>
  </os>
  <memory unit='KiB'>430080</memory>
  <vcpu>2</vcpu>
  <on_poweroff>destroy</on_poweroff>
  <on_reboot>destroy</on_reboot>
  <on_crash>destroy</on_crash>
  <devices>
    <disk type='block' device='disk'>
      <source dev='/dev/MainVG/GuestLV'/>
      <target dev='xvda'/>
    </disk>
    <console tty='/dev/pts/4'/>
  </devices>
</domain>
Fix Xen SEXPR generation to properly quote strings containing () * src/xen/sexpr.c: Ensure () are escaped in sexpr2string * tests/sexpr2xmldata/sexpr2xml-boot-grub.sexpr, tests/sexpr2xmldata/sexpr2xml-boot-grub.xml, tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr, tests/xml2sexprdata/xml2sexpr-boot-grub.xml: Data files to check escaping * tests/sexpr2xmltest.c, tests/xml2sexprtest.c: Add boot-grub escaping test case 2010-08-23 13:00:22 +00:00			`<domain type='xen' id='15'>`
			`<name>pvtest</name>`
			`<uuid>596a5d2171f48fb2e068e2386a5c413e</uuid>`
			`<os>`
			`<type>linux</type>`
			`<kernel>/usr/lib/xen/boot/pv-grub-x86_64.gz</kernel>`
			`<cmdline>(hd0,0)/grub/menu.lst</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			`<memory unit='KiB'>430080</memory>`
Fix Xen SEXPR generation to properly quote strings containing () * src/xen/sexpr.c: Ensure () are escaped in sexpr2string * tests/sexpr2xmldata/sexpr2xml-boot-grub.sexpr, tests/sexpr2xmldata/sexpr2xml-boot-grub.xml, tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr, tests/xml2sexprdata/xml2sexpr-boot-grub.xml: Data files to check escaping * tests/sexpr2xmltest.c, tests/xml2sexprtest.c: Add boot-grub escaping test case 2010-08-23 13:00:22 +00:00			`<vcpu>2</vcpu>`
			`<on_poweroff>destroy</on_poweroff>`
			`<on_reboot>destroy</on_reboot>`
			`<on_crash>destroy</on_crash>`
			`<devices>`
			`<disk type='block' device='disk'>`
			`<source dev='/dev/MainVG/GuestLV'/>`
			`<target dev='xvda'/>`
			`</disk>`
			`<console tty='/dev/pts/4'/>`
			`</devices>`
			`</domain>`