LXC: Fix handling of RAM filesystem size units
Since 76b644c when the support for RAM filesystems was introduced,
libvirt accepted the following XML:
<source usage='1024' unit='KiB'/>
This was parsed correctly and internally stored in bytes, but it
was formatted as (with an extra 's'):
<source usage='1024' units='KiB'/>
When read again, this was treated as if the units were missing,
meaning libvirt was unable to parse its own XML correctly.
The usage attribute was documented as being in KiB, but it was not
scaled if the unit was missing. Transient domains still worked,
because this was balanced by an extra 'k' in the mount options.
This patch:
Changes the parser to use 'units' instead of 'unit', as the latter
was never documented (fixing persistent domains) and some programs
(libvirt-glib, libvirt-sandbox) already parse the 'units' attribute.
Removes the extra 'k' from the tmpfs mount options, which is needed
because now we parse our own XML correctly.
Changes the default input unit to KiB to match documentation, fixing:
https://bugzilla.redhat.com/show_bug.cgi?id=1015689
2013-10-09 20:17:13 +08:00
|
|
|
<domain type='lxc'>
|
|
|
|
|
<name>demo</name>
|
|
|
|
|
<uuid>8369f1ac-7e46-e869-4ca5-759d51478066</uuid>
|
|
|
|
|
<memory unit='KiB'>500000</memory>
|
|
|
|
|
<currentMemory unit='KiB'>500000</currentMemory>
|
|
|
|
|
<vcpu placement='static'>1</vcpu>
|
|
|
|
|
<os>
|
|
|
|
|
<type arch='x86_64'>exe</type>
|
|
|
|
|
<init>/bin/sh</init>
|
|
|
|
|
</os>
|
|
|
|
|
<clock offset='utc'/>
|
|
|
|
|
<on_poweroff>destroy</on_poweroff>
|
|
|
|
|
<on_reboot>restart</on_reboot>
|
|
|
|
|
<on_crash>destroy</on_crash>
|
|
|
|
|
<devices>
|
|
|
|
|
<emulator>/usr/libexec/libvirt_lxc</emulator>
|
2013-11-08 01:14:32 +08:00
|
|
|
<filesystem type='bind' accessmode='passthrough'>
|
|
|
|
|
<source dir='/'/>
|
|
|
|
|
<target dir='/'/>
|
|
|
|
|
</filesystem>
|
LXC: Fix handling of RAM filesystem size units
Since 76b644c when the support for RAM filesystems was introduced,
libvirt accepted the following XML:
<source usage='1024' unit='KiB'/>
This was parsed correctly and internally stored in bytes, but it
was formatted as (with an extra 's'):
<source usage='1024' units='KiB'/>
When read again, this was treated as if the units were missing,
meaning libvirt was unable to parse its own XML correctly.
The usage attribute was documented as being in KiB, but it was not
scaled if the unit was missing. Transient domains still worked,
because this was balanced by an extra 'k' in the mount options.
This patch:
Changes the parser to use 'units' instead of 'unit', as the latter
was never documented (fixing persistent domains) and some programs
(libvirt-glib, libvirt-sandbox) already parse the 'units' attribute.
Removes the extra 'k' from the tmpfs mount options, which is needed
because now we parse our own XML correctly.
Changes the default input unit to KiB to match documentation, fixing:
https://bugzilla.redhat.com/show_bug.cgi?id=1015689
2013-10-09 20:17:13 +08:00
|
|
|
<filesystem type='ram' accessmode='passthrough'>
|
|
|
|
|
<source usage='1048576' units='KiB'/>
|
|
|
|
|
<target dir='/mnt/mississippi'/>
|
|
|
|
|
</filesystem>
|
|
|
|
|
<filesystem type='ram' accessmode='passthrough'>
|
|
|
|
|
<source usage='1024' units='KiB'/>
|
|
|
|
|
<target dir='/mnt/antananarivo'/>
|
|
|
|
|
</filesystem>
|
|
|
|
|
<filesystem type='ram' accessmode='passthrough'>
|
|
|
|
|
<source usage='1024' units='KiB'/>
|
|
|
|
|
<target dir='/mnt/ouagadougou'/>
|
|
|
|
|
</filesystem>
|
|
|
|
|
<console type='pty'>
|
|
|
|
|
<target type='lxc' port='0'/>
|
|
|
|
|
</console>
|
|
|
|
|
</devices>
|
|
|
|
|
</domain>
|