mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-23 14:15:28 +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.
52 lines
2.0 KiB
XML
52 lines
2.0 KiB
XML
<domain type='qemu'>
|
|
<name>QEMUGuest1</name>
|
|
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
|
|
<memory unit='KiB'>219136</memory>
|
|
<currentMemory unit='KiB'>219136</currentMemory>
|
|
<vcpu>1</vcpu>
|
|
<os>
|
|
<type arch='i686' machine='pc'>hvm</type>
|
|
<boot dev='hd'/>
|
|
</os>
|
|
<clock offset='utc'/>
|
|
<on_poweroff>destroy</on_poweroff>
|
|
<on_reboot>restart</on_reboot>
|
|
<on_crash>destroy</on_crash>
|
|
<devices>
|
|
<emulator>/usr/bin/qemu</emulator>
|
|
<disk type='file' device='disk'>
|
|
<source file='/tmp/scsidisk.img'/>
|
|
<target dev='sda' bus='scsi'/>
|
|
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
|
</disk>
|
|
<controller type='scsi' index='0'>
|
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='off'/>
|
|
</controller>
|
|
<controller type='scsi' index='1'>
|
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0' multifunction='on'/>
|
|
</controller>
|
|
<controller type='scsi' index='2'>
|
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x1' multifunction='on'/>
|
|
</controller>
|
|
<controller type='scsi' index='3'>
|
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x2'/>
|
|
</controller>
|
|
<controller type='scsi' index='4'>
|
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x3'/>
|
|
</controller>
|
|
<controller type='scsi' index='5'>
|
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x4'/>
|
|
</controller>
|
|
<controller type='scsi' index='6'>
|
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x5'/>
|
|
</controller>
|
|
<controller type='scsi' index='7'>
|
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x6'/>
|
|
</controller>
|
|
<controller type='scsi' index='8'>
|
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x7'/>
|
|
</controller>
|
|
<memballoon model='virtio'/>
|
|
</devices>
|
|
</domain>
|