NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Error out if setting vcpu count would lead to invalid config

Browse Source 
When the domain definition describes a machine with NUMA, setting the
maximum vCPU count via the API might lead to an invalid config.

Add a check that will forbid this until we add more advanced cpu config
capabilities.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1327499
This commit is contained in:
Peter Krempa 2016-04-27 16:39:41 +02:00
parent 63e2b766a5
commit b527e7c8e2
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libvirt_private.syms
View File

@ -674,6 +674,7 @@ virNodeDeviceObjUnlock;
virDomainNumaCheckABIStability; virDomainNumaCheckABIStability;
virDomainNumaEquals; virDomainNumaEquals;
virDomainNumaFree; virDomainNumaFree;
virDomainNumaGetCPUCountTotal;
virDomainNumaGetMaxCPUID; virDomainNumaGetMaxCPUID;
virDomainNumaGetMemorySize; virDomainNumaGetMemorySize;
virDomainNumaGetNodeCount; virDomainNumaGetNodeCount;

7
src/qemu/qemu_driver.c
View File

@ -4903,6 +4903,13 @@ qemuDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus,
if (persistentDef) { if (persistentDef) {
if (flags & VIR_DOMAIN_VCPU_MAXIMUM) { if (flags & VIR_DOMAIN_VCPU_MAXIMUM) {
if (virDomainNumaGetCPUCountTotal(persistentDef->numa) > nvcpus) {
virReportError(VIR_ERR_INVALID_ARG, "%s",
_("Number of CPUs in <numa> exceeds the desired "
"maximum vcpu count"));
goto endjob;
}
if (virDomainDefSetVcpusMax(persistentDef, nvcpus) < 0) if (virDomainDefSetVcpusMax(persistentDef, nvcpus) < 0)
goto endjob; goto endjob;
} else { } else {