External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-07 17:29:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: don't modify cpu set string during parsing

Browse Source 
None of the callers cared if str was updated to point to the next
byte after the parsed cpuset; simplifying this results in quite
a few code simplifications.  Additionally, virCPUDefParseXML was
strdup()'ing a malloc()'d string; avoiding a memory copy resulted
in less code.

* src/conf/domain_conf.h (virDomainCpuSetParse): Alter signature.
* src/conf/domain_conf.c (virDomainCpuSetParse): Don't modify str.
(virDomainVcpuPinDefParseXML, virDomainDefParseXML): Adjust
callers.
* src/conf/cpu_conf.c (virCPUDefParseXML): Likewise.
* src/xen/xend_internal.c (sexpr_to_xend_topology): Likewise.
* src/xen/xm_internal.c (xenXMDomainPinVcpu): Likewise.
* src/xenxs/xen_sxpr.c (xenParseSxpr): Likewise.
* src/xenxs/xen_xm.c (xenParseXM): Likewise.
This commit is contained in:
Eric Blake 2011-11-18 11:27:24 -07:00
parent 334c539ba0
commit 693d22d417
7 changed files with 18 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/conf/cpu_conf.c
View File

@ -311,42 +311,32 @@ virCPUDefParseXML(const xmlNodePtr node,
def->ncells = n;
for (i = 0 ; i < n ; i++) {
char *cpus, *cpus_parse, *memory;
char *cpus, *memory;
int cpumasklen = VIR_DOMAIN_CPUMASK_LEN;
int ret, ncpus = 0;
def->cells[i].cellid = i;
cpus = cpus_parse = virXMLPropString(nodes[i], "cpus");
cpus = virXMLPropString(nodes[i], "cpus");
if (!cpus) {
virCPUReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("Missing 'cpus' attribute in NUMA cell"));
goto error;
}
def->cells[i].cpustr = cpus;
def->cells[i].cpustr = strdup(cpus);
if (!def->cells[i].cpustr) {
VIR_FREE(cpus);
if (VIR_ALLOC_N(def->cells[i].cpumask, cpumasklen) < 0)
goto no_memory;
}
if (VIR_ALLOC_N(def->cells[i].cpumask, cpumasklen) < 0) {
VIR_FREE(cpus);
goto no_memory;
}
ncpus = virDomainCpuSetParse((const char **)&cpus_parse,
0, def->cells[i].cpumask, cpumasklen);
if (ncpus <= 0) {
VIR_FREE(cpus);
ncpus = virDomainCpuSetParse(cpus, 0, def->cells[i].cpumask,
cpumasklen);
if (ncpus <= 0)
goto error;
}
def->cells_cpus += ncpus;
memory = virXMLPropString(nodes[i], "memory");
if (!memory) {
virCPUReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("Missing 'memory' attribute in NUMA cell"));
VIR_FREE(cpus);
goto error;
}
@ -354,11 +344,9 @@ virCPUDefParseXML(const xmlNodePtr node,
if (ret == -1) {
virCPUReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("Invalid 'memory' attribute in NUMA cell"));
VIR_FREE(cpus);
VIR_FREE(memory);
goto error;
}
VIR_FREE(cpus);
VIR_FREE(memory);
}
}

17
src/conf/domain_conf.c
View File

@ -6636,8 +6636,7 @@ virDomainVcpuPinDefParseXML(const xmlNodePtr node,
virReportOOMError();
goto error;
}
if (virDomainCpuSetParse((const char **)&set,
0, def->cpumask,
if (virDomainCpuSetParse(set, 0, def->cpumask,
cpumasklen) < 0)
goto error;
VIR_FREE(tmp);
@ -6850,8 +6849,7 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps,
if (VIR_ALLOC_N(def->cpumask, def->cpumasklen) < 0) {
goto no_memory;
}
if (virDomainCpuSetParse((const char **)&set,
0, def->cpumask,
if (virDomainCpuSetParse(set, 0, def->cpumask,
def->cpumasklen) < 0)
goto error;
VIR_FREE(tmp);
@ -6921,8 +6919,7 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps,
}
/* "nodeset" leads same syntax with "cpuset". */
if (virDomainCpuSetParse((const char **)&set,
0, def->numatune.memory.nodemask,
if (virDomainCpuSetParse(set, 0, def->numatune.memory.nodemask,
nodemasklen) < 0)
goto error;
VIR_FREE(tmp);
@ -9155,7 +9152,7 @@ virDomainCpuSetFormat(char *cpuset, int maxcpu)
/**
* virDomainCpuSetParse:
* @conn: connection
* @str: pointer to a CPU set string pointer
* @str: a CPU set string pointer
* @sep: potential character used to mark the end of string if not 0
* @cpuset: pointer to a char array for the CPU set
* @maxcpu: number of elements available in @cpuset
@ -9166,10 +9163,9 @@ virDomainCpuSetFormat(char *cpuset, int maxcpu)
*
* Returns the number of CPU found in that set, or -1 in case of error.
* @cpuset is modified accordingly to the value parsed.
* @str is updated to the end of the part parsed
*/
int
virDomainCpuSetParse(const char **str, char sep,
virDomainCpuSetParse(const char *str, char sep,
char *cpuset, int maxcpu)
{
const char *cur;
@ -9181,7 +9177,7 @@ virDomainCpuSetParse(const char **str, char sep,
(maxcpu > 100000))
return (-1);
cur = *str;
cur = str;
virSkipSpaces(&cur);
if (*cur == 0)
goto parse_error;
@ -9246,7 +9242,6 @@ virDomainCpuSetParse(const char **str, char sep,
} else
goto parse_error;
}
*str = cur;
return (ret);
parse_error:

2
src/conf/domain_conf.h
View File

@ -1747,7 +1747,7 @@ int virDomainDefFormatInternal(virDomainDefPtr def,
unsigned int flags,
virBufferPtr buf);
int virDomainCpuSetParse(const char **str,
int virDomainCpuSetParse(const char *str,
char sep,
char *cpuset,
int maxcpu);

2
src/xen/xend_internal.c
View File

@ -1153,7 +1153,7 @@ sexpr_to_xend_topology(const struct sexpr *root,
for (cpu = 0; cpu < numCpus; cpu++)
cpuset[cpu] = 0;
} else {
nb_cpus = virDomainCpuSetParse(&cur, 'n', cpuset, numCpus);
nb_cpus = virDomainCpuSetParse(cur, 'n', cpuset, numCpus);
if (nb_cpus < 0)
goto error;
}

3
src/xen/xm_internal.c
View File

@ -893,8 +893,7 @@ int xenXMDomainPinVcpu(virDomainPtr domain,
virReportOOMError();
goto cleanup;
}
if (virDomainCpuSetParse((const char **)&mapstr, 0,
cpuset, maxcpu) < 0)
if (virDomainCpuSetParse(mapstr, 0, cpuset, maxcpu) < 0)
goto cleanup;
VIR_FREE(entry->def->cpumask);

3
src/xenxs/xen_sxpr.c
View File

@ -1140,8 +1140,7 @@ xenParseSxpr(const struct sexpr *root,
goto error;
}
if (virDomainCpuSetParse(&cpus,
0, def->cpumask,
if (virDomainCpuSetParse(cpus, 0, def->cpumask,
def->cpumasklen) < 0) {
XENXS_ERROR(VIR_ERR_INTERNAL_ERROR,
_("invalid CPU mask %s"), cpus);

2
src/xenxs/xen_xm.c
View File

@ -338,7 +338,7 @@ xenParseXM(virConfPtr conf, int xendConfigVersion,
if (VIR_ALLOC_N(def->cpumask, def->cpumasklen) < 0)
goto no_memory;
if (virDomainCpuSetParse(&str, 0,
if (virDomainCpuSetParse(str, 0,
def->cpumask, def->cpumasklen) < 0)
goto cleanup;
}