NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-01-08 07:03:19 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu: driver: Validate configuration when setting maximum vcpu count

Browse Source 
Setting vcpu count when cpu topology is specified may result into an
invalid configuration. Since the topology can't be modified, reject the
setting if it doesn't match the requested topology. This will allow
fixing the topology in case it was broken.

Partially fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1370066
This commit is contained in:
Peter Krempa 2016-08-25 15:30:21 -04:00
parent c9cb35c255
commit 802fac97ec
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/qemu/qemu_driver.c
View File

@ -4730,6 +4730,18 @@ qemuDomainSetVcpusMax(virQEMUDriverPtr driver,
goto cleanup;
}
if (persistentDef && persistentDef->cpu && persistentDef->cpu->sockets) {
/* allow setting a valid vcpu count for the topology so an invalid
* setting may be corrected via this API */
if (nvcpus != persistentDef->cpu->sockets *
persistentDef->cpu->cores *
persistentDef->cpu->threads) {
virReportError(VIR_ERR_INVALID_ARG, "%s",
_("CPU topology doesn't match the desired vcpu count"));
goto cleanup;
}
}
if (virDomainDefSetVcpusMax(persistentDef, nvcpus, driver->xmlopt) < 0)
goto cleanup;