mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-23 21:34:54 +03:00
265457845f
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.
37 lines
1.1 KiB
XML
37 lines
1.1 KiB
XML
<domain type='lxc'>
|
|
<name>portprofile</name>
|
|
<uuid>00000000-0000-0000-0000-000000000000</uuid>
|
|
<memory unit='KiB'>1048576</memory>
|
|
<os>
|
|
<type>exe</type>
|
|
<init>/sh</init>
|
|
</os>
|
|
<devices>
|
|
<interface type='direct'>
|
|
<source dev='eth0' mode='vepa'/>
|
|
<virtualport type='802.1Qbg'>
|
|
<parameters managerid='12' typeid='1193046' typeidversion='1'
|
|
instanceid='fa9b7fff-b0a0-4893-8e0e-beef4ff18f8f'/>
|
|
</virtualport>
|
|
</interface>
|
|
<interface type='direct'>
|
|
<source dev='eth0' mode='vepa'/>
|
|
<virtualport type='802.1Qbg'>
|
|
<parameters managerid='12' typeid='1193046' typeidversion='1'/>
|
|
</virtualport>
|
|
</interface>
|
|
<interface type='direct'>
|
|
<source dev='eth0' mode='vepa'/>
|
|
<virtualport type='802.1Qbh'>
|
|
<parameters profileid='my_profile'/>
|
|
</virtualport>
|
|
</interface>
|
|
<interface type='direct'>
|
|
<source dev='eth0' mode='vepa'/>
|
|
</interface>
|
|
<interface type='direct'>
|
|
<source dev='eth0' mode='vepa'/>
|
|
</interface>
|
|
</devices>
|
|
</domain>
|