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.
43 lines
1.1 KiB
XML
43 lines
1.1 KiB
XML
<domain type='qemu'>
|
|
<name>QEMUGuest1</name>
|
|
<uuid>2754dd7b-ac8a-4850-aec0-1f3fcd43235b</uuid>
|
|
<memory unit='KiB'>524288</memory>
|
|
<vcpu>1</vcpu>
|
|
<os>
|
|
<type arch='ppc64' machine='pseries'>hvm</type>
|
|
</os>
|
|
<clock offset='utc'/>
|
|
<devices>
|
|
<emulator>/usr/bin/qemu-system-ppc64</emulator>
|
|
<console type='pty'>
|
|
<address type="spapr-vio"/>
|
|
</console>
|
|
|
|
<!-- Two serials, first is the console -->
|
|
<serial type="pty">
|
|
<address type="spapr-vio"/>
|
|
</serial>
|
|
<serial type="pty">
|
|
<address type="spapr-vio" reg="0x4000"/>
|
|
</serial>
|
|
|
|
<!-- One disk -->
|
|
<disk type="file" device="disk">
|
|
<driver name="qemu" type="raw"/>
|
|
<source file="/tmp/scsidisk.img"/>
|
|
<target dev="sda" bus="scsi"/>
|
|
<address type="drive" controller="1"/>
|
|
</disk>
|
|
|
|
<!-- Two SCSI controllers -->
|
|
<controller type="scsi" index="1">
|
|
<address type="spapr-vio"/>
|
|
</controller>
|
|
<controller type="scsi" index="0">
|
|
<address type="spapr-vio" reg="0x4000"/>
|
|
</controller>
|
|
|
|
<memballoon model="none"/>
|
|
</devices>
|
|
</domain>
|