openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
libvirt/tests/sexpr2xmldata
History
Eric Blake 265457845f 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-03-07 18:24:43 -07:00
..
sexpr2xml-boot-grub.sexpr maint: avoid long lines in more tests 2011-03-03 07:45:31 -07:00
sexpr2xml-boot-grub.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-bridge-ipaddr.sexpr maint: avoid long lines in more tests 2011-03-03 07:45:31 -07:00
sexpr2xml-bridge-ipaddr.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-curmem.sexpr * src/xend_internal.c src/xml.c: add an extra element currentMemory 2006-11-10 11:13:01 +00:00
sexpr2xml-curmem.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-disk-block-shareable.sexpr maint: avoid long lines in more tests 2011-03-03 07:45:31 -07:00
sexpr2xml-disk-block-shareable.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-disk-block.sexpr maint: avoid long lines in more tests 2011-03-03 07:45:31 -07:00
sexpr2xml-disk-block.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-disk-drv-blktap-qcow.sexpr maint: avoid long lines in more tests 2011-03-03 07:45:31 -07:00
sexpr2xml-disk-drv-blktap-qcow.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-disk-drv-blktap-raw.sexpr maint: avoid long lines in more tests 2011-03-03 07:45:31 -07:00
sexpr2xml-disk-drv-blktap-raw.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-disk-drv-blktap2-raw.sexpr maint: avoid long lines in more tests 2011-03-03 07:45:31 -07:00
sexpr2xml-disk-drv-blktap2-raw.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-disk-file.sexpr maint: avoid long lines in more tests 2011-03-03 07:45:31 -07:00
sexpr2xml-disk-file.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-fv-autoport.sexpr add missing files 2009-01-29 17:14:48 +00:00
sexpr2xml-fv-autoport.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-fv-empty-kernel.sexpr xen_xs: Guard against set but empty kernel argument 2011-10-10 22:58:04 +02:00
sexpr2xml-fv-empty-kernel.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-fv-force-hpet.sexpr xen: parse and generate hpet item in sxpr 2011-05-10 16:16:55 -06:00
sexpr2xml-fv-force-hpet.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-fv-force-nohpet.sexpr xen: parse and generate hpet item in sxpr 2011-05-10 16:16:55 -06:00
sexpr2xml-fv-force-nohpet.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-fv-kernel.sexpr maint: avoid long lines in more tests 2011-03-03 07:45:31 -07:00
sexpr2xml-fv-kernel.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-fv-legacy-vfb.sexpr Added support for booting off kenrel+initrd with HVM guests 2008-02-05 16:21:25 +00:00
sexpr2xml-fv-legacy-vfb.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-fv-localtime.sexpr maint: avoid long lines in more tests 2011-03-03 07:45:31 -07:00
sexpr2xml-fv-localtime.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-fv-net-ioemu.sexpr maint: avoid long lines in more tests 2011-03-03 07:45:31 -07:00
sexpr2xml-fv-net-ioemu.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-fv-net-netfront.sexpr maint: avoid long lines in more tests 2011-03-03 07:45:31 -07:00
sexpr2xml-fv-net-netfront.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-fv-parallel-tcp.sexpr maint: avoid long lines in more tests 2011-03-03 07:45:31 -07:00
sexpr2xml-fv-parallel-tcp.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-fv-serial-dev-2-ports.sexpr maint: avoid long lines in more tests 2011-03-03 07:45:31 -07:00
sexpr2xml-fv-serial-dev-2-ports.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-fv-serial-dev-2nd-port.sexpr maint: avoid long lines in more tests 2011-03-03 07:45:31 -07:00
sexpr2xml-fv-serial-dev-2nd-port.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-fv-serial-file.sexpr maint: avoid long lines in more tests 2011-03-03 07:45:31 -07:00
sexpr2xml-fv-serial-file.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-fv-serial-null.sexpr maint: avoid long lines in more tests 2011-03-03 07:45:31 -07:00
sexpr2xml-fv-serial-null.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-fv-serial-pipe.sexpr maint: avoid long lines in more tests 2011-03-03 07:45:31 -07:00
sexpr2xml-fv-serial-pipe.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-fv-serial-pty.sexpr maint: avoid long lines in more tests 2011-03-03 07:45:31 -07:00
sexpr2xml-fv-serial-pty.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-fv-serial-stdio.sexpr maint: avoid long lines in more tests 2011-03-03 07:45:31 -07:00
sexpr2xml-fv-serial-stdio.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-fv-serial-tcp-telnet.sexpr maint: avoid long lines in more tests 2011-03-03 07:45:31 -07:00
sexpr2xml-fv-serial-tcp-telnet.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-fv-serial-tcp.sexpr maint: avoid long lines in more tests 2011-03-03 07:45:31 -07:00
sexpr2xml-fv-serial-tcp.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-fv-serial-udp.sexpr maint: avoid long lines in more tests 2011-03-03 07:45:31 -07:00
sexpr2xml-fv-serial-udp.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-fv-serial-unix.sexpr maint: avoid long lines in more tests 2011-03-03 07:45:31 -07:00
sexpr2xml-fv-serial-unix.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-fv-sound-all.sexpr maint: avoid long lines in more tests 2011-03-03 07:45:31 -07:00
sexpr2xml-fv-sound-all.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-fv-sound.sexpr maint: avoid long lines in more tests 2011-03-03 07:45:31 -07:00
sexpr2xml-fv-sound.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-fv-usbmouse.sexpr maint: avoid long lines in more tests 2011-03-03 07:45:31 -07:00
sexpr2xml-fv-usbmouse.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-fv-usbtablet.sexpr maint: avoid long lines in more tests 2011-03-03 07:45:31 -07:00
sexpr2xml-fv-usbtablet.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-fv-utc.sexpr maint: avoid long lines in more tests 2011-03-03 07:45:31 -07:00
sexpr2xml-fv-utc.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-fv-v2.sexpr maint: avoid long lines in more tests 2011-03-03 07:45:31 -07:00
sexpr2xml-fv-v2.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-fv.sexpr maint: avoid long lines in more tests 2011-03-03 07:45:31 -07:00
sexpr2xml-fv.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-net-bridged.sexpr maint: avoid long lines in more tests 2011-03-03 07:45:31 -07:00
sexpr2xml-net-bridged.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-net-e1000.sexpr maint: avoid long lines in more tests 2011-03-03 07:45:31 -07:00
sexpr2xml-net-e1000.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-net-routed.sexpr maint: avoid long lines in more tests 2011-03-03 07:45:31 -07:00
sexpr2xml-net-routed.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-no-source-cdrom.sexpr * src/xend_internal.c src/xml.c: applied patch from Nobuhiro Itou 2007-04-11 16:06:30 +00:00
sexpr2xml-no-source-cdrom.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-pci-devs.sexpr maint: avoid long lines in more tests 2011-03-03 07:45:31 -07:00
sexpr2xml-pci-devs.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-pv-bootloader-cmdline.sexpr Do not drop kernel cmdline for xen pv domains 2011-07-11 09:11:15 -06:00
sexpr2xml-pv-bootloader-cmdline.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-pv-bootloader.sexpr maint: avoid long lines in more tests 2011-03-03 07:45:31 -07:00
sexpr2xml-pv-bootloader.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-pv-localtime.sexpr maint: avoid long lines in more tests 2011-03-03 07:45:31 -07:00
sexpr2xml-pv-localtime.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-pv-vcpus.sexpr maint: avoid long lines in more tests 2011-03-03 07:45:31 -07:00
sexpr2xml-pv-vcpus.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-pv-vfb-new-vncdisplay.sexpr maint: avoid long lines in more tests 2011-03-03 07:45:31 -07:00
sexpr2xml-pv-vfb-new-vncdisplay.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-pv-vfb-new.sexpr maint: avoid long lines in more tests 2011-03-03 07:45:31 -07:00
sexpr2xml-pv-vfb-new.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-pv-vfb-orig.sexpr maint: avoid long lines in more tests 2011-03-03 07:45:31 -07:00
sexpr2xml-pv-vfb-orig.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-pv-vfb-type-crash.sexpr Add test for recently fixed crash with latest XenD 2009-08-19 17:44:50 +01:00
sexpr2xml-pv-vfb-type-crash.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00
sexpr2xml-pv.sexpr maint: avoid long lines in more tests 2011-03-03 07:45:31 -07:00
sexpr2xml-pv.xml xml: output memory unit for clarity 2012-03-07 18:24:43 -07:00