External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-01 17:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix initialization of current vcpus in libxl driver

Browse Source 
The cur_vcpus member of struct libxl_domain_build_info was incorrectly
initialized to the number of vcpus, when it should have been interpreted
as a bitmap, where bit X corresponds to online/offline status of vcpuX.

To complicate matters, cur_vcpus is an int, so only 32 vcpus can be
set online.  Add a check to ensure vcpus does not exceed this limit.

V2: Eric Blake noted a compilation pitfal when '1 << 32' on an int.
    Account for vcpus == 32.
This commit is contained in:
Jim Fehlig 2011-05-23 16:06:00 -06:00
parent 4486f3a209
commit 492e493a1e
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/libxl/libxl_conf.c
View File

@ -379,11 +379,26 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, libxl_domain_config *d_config)
int hvm = STREQ(def->os.type, "hvm");
int i;
/* Currently, libxenlight only supports 32 vcpus per domain.
* cur_vcpus member of struct libxl_domain_build_info is defined
* as an int, but its semantic is a bitmap of online vcpus, so
* only 32 can be represented.
*/
if (def->maxvcpus > 32 || def->vcpus > 32) {
libxlError(VIR_ERR_INTERNAL_ERROR,
_("This version of libxenlight only supports 32 "
"vcpus per domain"));
return -1;
}
libxl_init_build_info(b_info, &d_config->c_info);
b_info->hvm = hvm;
b_info->max_vcpus = def->maxvcpus;
b_info->cur_vcpus = def->vcpus;
if (def->vcpus == 32)
b_info->cur_vcpus = (uint32_t) -1;
else
b_info->cur_vcpus = (1 << def->vcpus) - 1;
if (def->clock.ntimers > 0 &&
def->clock.timers[0]->name == VIR_DOMAIN_TIMER_NAME_TSC) {
switch (def->clock.timers[0]->mode) {