mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-07-11 04:15:49 +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.
81 lines
1.8 KiB
Bash
Executable File
81 lines
1.8 KiB
Bash
Executable File
#!/bin/sh
|
|
# Exercise a bug whereby defining a valid domain could kill libvirtd.
|
|
# The bug can also be exercised with a simple define/dumpxml pair to virsh.
|
|
|
|
test -z "$srcdir" && srcdir=$(pwd)
|
|
test -z "$abs_top_srcdir" && abs_top_srcdir=$(pwd)/..
|
|
test -z "$abs_top_builddir" && abs_top_builddir=$(pwd)/..
|
|
|
|
if test "$VERBOSE" = yes; then
|
|
set -x
|
|
$abs_top_builddir/tools/virsh --version
|
|
fi
|
|
|
|
. "$srcdir/test-lib.sh"
|
|
|
|
fail=0
|
|
|
|
# Domain definition from Cole Robinson.
|
|
cat <<\EOF > D.xml || fail=1
|
|
<domain type='test'>
|
|
<name>D</name>
|
|
<uuid>aaa3ae22-fed2-bfbd-ac02-3bea3bcfad82</uuid>
|
|
<memory unit='KiB'>262144</memory>
|
|
<currentMemory unit='KiB'>262144</currentMemory>
|
|
<vcpu>1</vcpu>
|
|
<os>
|
|
<type arch='i686' machine='pc'>hvm</type>
|
|
<boot dev='cdrom'/>
|
|
</os>
|
|
<features>
|
|
<acpi/>
|
|
</features>
|
|
<clock offset='utc'/>
|
|
<on_poweroff>destroy</on_poweroff>
|
|
<on_reboot>restart</on_reboot>
|
|
<on_crash>destroy</on_crash>
|
|
<devices>
|
|
<emulator>/usr/bin/qemu-kvm</emulator>
|
|
<controller type='usb' index='0'/>
|
|
<serial type='pty'>
|
|
<target port='0'/>
|
|
</serial>
|
|
<serial type='pty'>
|
|
<target port='1'/>
|
|
</serial>
|
|
<serial type='pty'>
|
|
<target port='2'/>
|
|
</serial>
|
|
<parallel type='pty'>
|
|
<target port='0'/>
|
|
</parallel>
|
|
<parallel type='pty'>
|
|
<target port='1'/>
|
|
</parallel>
|
|
<parallel type='pty'>
|
|
<target port='2'/>
|
|
</parallel>
|
|
<console type='pty'>
|
|
<target type='serial' port='0'/>
|
|
</console>
|
|
<sound model='pcspk'/>
|
|
<sound model='es1370'/>
|
|
<memballoon model='virtio'/>
|
|
</devices>
|
|
</domain>
|
|
EOF
|
|
|
|
url=test:///default
|
|
$abs_top_builddir/tools/virsh --connect "$url" 'define D.xml; dumpxml D' > out 2>&1 || fail=1
|
|
|
|
cat > exp <<EOF || fail=1
|
|
Domain D defined from D.xml
|
|
|
|
$(cat D.xml)
|
|
|
|
EOF
|
|
|
|
compare exp out || fail=1
|
|
|
|
exit $fail
|