mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-26 23:55:23 +00:00
5b74103b0b
From: Ian Campbell <ian.campbell@citrix.com> xend prior to 4.0 understands vcpus as maxvcpus and vcpu_avail as a bit map of which cpus are online (default is all). xend from 4.0 onwards understands maxvcpus as maxvcpus and vcpus as the number which are online (from 0..N-1). The upstream commit (68a94cf528e6 "xm: Add maxvcpus support") claims that if maxvcpus is omitted then the old behaviour (i.e. obeying vcpu_avail) is retained, but AFAICT it was not, in this case vcpu==maxcpus==online cpus. This is good for us because handling anything else would be fiddly. This patch changes parsing of the virDomainDef maxvcpus and vcpus entries to use the corresponding 'maxvcpus' and 'vcpus' settings from xm and xl config. It also drops use of the old Xen 3.x 'vcpu_avail' setting. The change also removes the maxvcpus limit of MAX_VIRT_VCPUS (since maxvcpus is simply a count, not a bit mask), which is particularly crucial on ARM where MAX_VIRT_CPUS == 1 (since all guests are expected to support vcpu placement, and therefore only the boot vcpu's info lives in the shared info page). Existing tests adjusted accordingly, and new tests added for the 'maxvcpus' setting.
32 lines
936 B
XML
32 lines
936 B
XML
<domain type='xen'>
|
|
<name>XenGuest1</name>
|
|
<uuid>c7a5fdb0-cdaf-9455-926a-d65c16db1809</uuid>
|
|
<memory unit='KiB'>592896</memory>
|
|
<currentMemory unit='KiB'>403456</currentMemory>
|
|
<vcpu placement='static' current='2'>4</vcpu>
|
|
<bootloader>/usr/bin/pygrub</bootloader>
|
|
<os>
|
|
<type arch='i686' machine='xenpv'>linux</type>
|
|
</os>
|
|
<clock offset='utc' adjustment='reset'/>
|
|
<on_poweroff>destroy</on_poweroff>
|
|
<on_reboot>restart</on_reboot>
|
|
<on_crash>restart</on_crash>
|
|
<devices>
|
|
<disk type='block' device='disk'>
|
|
<driver name='phy'/>
|
|
<source dev='/dev/HostVG/XenGuest1'/>
|
|
<target dev='xvda' bus='xen'/>
|
|
</disk>
|
|
<interface type='bridge'>
|
|
<mac address='00:16:3e:66:94:9c'/>
|
|
<source bridge='br0'/>
|
|
<script path='vif-bridge'/>
|
|
</interface>
|
|
<console type='pty'>
|
|
<target type='xen' port='0'/>
|
|
</console>
|
|
<memballoon model='xen'/>
|
|
</devices>
|
|
</domain>
|