External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 04:15:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

xenParseXLNamespaceData: Pre-calculate the length of array

Browse Source 
Precalculate the lenght to avoid use of 'virStringListAdd' in a loop.
The code is also simplified by using APIs which don't return errors.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Peter Krempa 2021-02-04 22:53:45 +01:00
parent 00dfd9c97d
commit 4a33825314
1 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/libxl/xen_xl.c
View File

@ -1150,33 +1150,36 @@ static int
xenParseXLNamespaceData(virConfPtr conf, virDomainDefPtr def)
{
virConfValuePtr list = virConfGetValue(conf, "device_model_args");
g_auto(GStrv) args = NULL;
size_t nargs;
virConfValuePtr next;
size_t nargs = 0;
libxlDomainXmlNsDefPtr nsdata = NULL;
size_t n = 0;
if (list && list->type == VIR_CONF_LIST) {
list = list->list;
while (list) {
if ((list->type != VIR_CONF_STRING) || (list->str == NULL)) {
list = list->next;
continue;
}
virStringListAdd(&args, list->str);
list = list->next;
}
}
if (!args)
if (!list || list->type != VIR_CONF_LIST)
return 0;
nargs = g_strv_length(args);
if (nargs > 0) {
nsdata = g_new0(libxlDomainXmlNsDef, 1);
list = list->list;
nsdata->args = g_steal_pointer(&args);
nsdata->num_args = nargs;
def->namespaceData = nsdata;
for (next = list; next; next = next->next) {
if (next->type != VIR_CONF_STRING || !next->str)
continue;
nargs++;
}
if (nargs == 0)
return 0;
nsdata = g_new0(libxlDomainXmlNsDef, 1);
def->namespaceData = nsdata;
nsdata->args = g_new0(char *, nargs + 1);
nsdata->num_args = nargs;
for (next = list; next; next = next->next) {
if (next->type != VIR_CONF_STRING || !next->str)
continue;
nsdata->args[n++] = g_strdup(next->str);
}
return 0;