shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 21:34:54 +03:00
Code Releases Activity

conf: resctrl object is not properly handled

Browse Source 
resctrl object stored in def->resctrls is shared by cachetune and
memorytune. The domain xml configuration is parsed firstly for
cachetune then memorytune, and the resctrl object will not be created
in parsing settings for memorytune once it found sharing exists.

But resctrl is improperly freed when sharing happens.

Signed-off-by: Wang Huaqiang <huaqiang.wang@intel.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Wang Huaqiang 2019-08-20 18:06:03 +08:00 committed by Michal Privoznik
parent 25b94e3b59
commit 51da92f418
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/conf/domain_conf.c
View File

@ -19590,7 +19590,6 @@ virDomainMemorytuneDefParse(virDomainDefPtr def,
VIR_AUTOUNREF(virResctrlAllocPtr) alloc = NULL; VIR_AUTOUNREF(virResctrlAllocPtr) alloc = NULL;
ssize_t i = 0; ssize_t i = 0;
int n; int n;
int ret = -1;
ctxt->node = node; ctxt->node = node;
@ -19632,14 +19631,13 @@ virDomainMemorytuneDefParse(virDomainDefPtr def,
if (!(resctrl = virDomainResctrlNew(node, alloc, vcpus, flags))) if (!(resctrl = virDomainResctrlNew(node, alloc, vcpus, flags)))
return -1; return -1;
if (VIR_APPEND_ELEMENT(def->resctrls, def->nresctrls, resctrl) < 0) if (VIR_APPEND_ELEMENT(def->resctrls, def->nresctrls, resctrl) < 0) {
goto cleanup; virDomainResctrlDefFree(resctrl);
return -1;
}
} }
ret = 0; return 0;
cleanup:
virDomainResctrlDefFree(resctrl);
return ret;
} }

4
tests/genericxml2xmlindata/memorytune.xml
View File

@ -5,6 +5,10 @@
<currentMemory unit='KiB'>219136</currentMemory> <currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>4</vcpu> <vcpu placement='static'>4</vcpu>
<cputune> <cputune>
<cachetune vcpus='0-1'>
<cache id='0' level='3' type='both' size='768' unit='KiB'/>
<cache id='1' level='3' type='both' size='768' unit='KiB'/>
</cachetune>
<memorytune vcpus='0-1'> <memorytune vcpus='0-1'>
<node id='0' bandwidth='20'/> <node id='0' bandwidth='20'/>
<node id='1' bandwidth='30'/> <node id='1' bandwidth='30'/>