mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-11-03 11:51:11 +00: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.
48 lines
1.5 KiB
XML
48 lines
1.5 KiB
XML
<domain type='vmware'>
|
|
<name>virtDebian1</name>
|
|
<uuid>564dcd37-3685-8889-35ea-719fc93c983e</uuid>
|
|
<memory unit='KiB'>1024000</memory>
|
|
<currentMemory unit='KiB'>120832</currentMemory>
|
|
<vcpu cpuset='0-2,5-7'>4</vcpu>
|
|
<os>
|
|
<type arch='x86_64'>hvm</type>
|
|
</os>
|
|
<clock offset='utc'/>
|
|
<on_poweroff>destroy</on_poweroff>
|
|
<on_reboot>restart</on_reboot>
|
|
<on_crash>destroy</on_crash>
|
|
<devices>
|
|
<disk type='file' device='disk'>
|
|
<driver name='lsilogic' cache='writethrough'/>
|
|
<source file='[498076b2-02796c1a-ef5b-000ae484a6a3] virtDebian1/Debian1.vmdk'/>
|
|
<target dev='sda' bus='scsi'/>
|
|
</disk>
|
|
<disk type='file' device='cdrom'>
|
|
<driver name='buslogic'/>
|
|
<source file='[498076b2-02796c1a-ef5b-000ae484a6a3] virtDebian1/Debian1-cdrom.iso'/>
|
|
<target dev='sdp' bus='scsi'/>
|
|
</disk>
|
|
<disk type='file' device='cdrom'>
|
|
<source file='/vmimages/tools-isoimages/linux.iso'/>
|
|
<target dev='hda' bus='ide'/>
|
|
</disk>
|
|
<disk type='block' device='cdrom'>
|
|
<source dev='/dev/scd0'/>
|
|
<target dev='hdb' bus='ide'/>
|
|
</disk>
|
|
<disk type='file' device='disk'>
|
|
<source file='[498076b2-02796c1a-ef5b-000ae484a6a3] virtDebian1/Debian1-IDE.vmdk'/>
|
|
<target dev='hdd' bus='ide'/>
|
|
</disk>
|
|
<disk type='block' device='floppy'>
|
|
<source dev='/dev/fd0'/>
|
|
<target dev='fda' bus='fdc'/>
|
|
</disk>
|
|
<interface type='bridge'>
|
|
<mac address='00:0c:29:3c:98:3e'/>
|
|
<source bridge='VM Network'/>
|
|
<model type='vlance'/>
|
|
</interface>
|
|
</devices>
|
|
</domain>
|