• E
    xml: output memory unit for clarity · 26545784
    Eric Blake 提交于
    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.
    26545784
vmx2xml-gsx-in-the-wild-2.xml 894 字节