External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

virDomainVcpuParse: Assign default vcpus count based on return value of virXMLPropUInt

Browse Source 
Assign the vcpu count when virXMLPropUInt returns '0' meaning that the
cpu count was not present in the XML. This will allow to always
initialize the value of @result in virXMLPropUInt to prevent use of
uninitialized values.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Peter Krempa 2021-05-06 15:07:04 +02:00
parent d919d9bbcd
commit e9bf68848c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/conf/domain_conf.c
View File

@ -18030,6 +18030,7 @@ virDomainVcpuParse(virDomainDef *def,
unsigned int vcpus;
g_autofree char *tmp = NULL;
g_autofree xmlNodePtr *nodes = NULL;
int rc;
vcpus = maxvcpus = 1;
@ -18044,10 +18045,11 @@ virDomainVcpuParse(virDomainDef *def,
}
VIR_FREE(tmp);
vcpus = maxvcpus;
if (virXMLPropUInt(vcpuNode, "current", 10, VIR_XML_PROP_NONE, &vcpus) < 0)
if ((rc = virXMLPropUInt(vcpuNode, "current", 10, VIR_XML_PROP_NONE, &vcpus)) < 0) {
return -1;
} else if (rc == 0) {
vcpus = maxvcpus;
}
def->placement_mode = VIR_DOMAIN_CPU_PLACEMENT_MODE_STATIC;
if (virXMLPropEnum(vcpuNode, "placement",