External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-11 15:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: refactor virNetworkLoadState

Browse Source 
Use g_auto where possible, reducing variable scope where applicable.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Ján Tomko 2021-08-17 12:45:13 +02:00
parent 1550892e85
commit 4a8ce37bf1
1 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/conf/virnetworkobj.c
View File

@ -860,13 +860,13 @@ virNetworkLoadState(virNetworkObjList *nets,
const char *name, const char *name,
virNetworkXMLOption *xmlopt) virNetworkXMLOption *xmlopt)
{ {
char *configFile = NULL; g_autofree char *configFile = NULL;
virNetworkDef *def = NULL; virNetworkDef *def = NULL;
virNetworkObj *obj = NULL; virNetworkObj *obj = NULL;
xmlDocPtr xml = NULL; g_autoptr(xmlDoc) xml = NULL;
xmlNodePtr node = NULL, *nodes = NULL; xmlNodePtr node = NULL;
xmlXPathContextPtr ctxt = NULL; g_autoptr(xmlXPathContext) ctxt = NULL;
virBitmap *classIdMap = NULL; g_autoptr(virBitmap) classIdMap = NULL;
unsigned long long floor_sum_val = 0; unsigned long long floor_sum_val = 0;
unsigned int taint = 0; unsigned int taint = 0;
int n; int n;
@ -903,18 +903,16 @@ virNetworkLoadState(virNetworkObjList *nets,
if (virXMLNodeNameEqual(node, "networkstatus")) { if (virXMLNodeNameEqual(node, "networkstatus")) {
/* Newer network status file. Contains useful /* Newer network status file. Contains useful
* info which are not to be found in bare config XML */ * info which are not to be found in bare config XML */
char *classIdStr = NULL; g_autofree char *classIdStr = NULL;
char *floor_sum = NULL; g_autofree char *floor_sum = NULL;
g_autofree xmlNodePtr *nodes = NULL;
ctxt->node = node; ctxt->node = node;
if ((classIdStr = virXPathString("string(./class_id[1]/@bitmap)", if ((classIdStr = virXPathString("string(./class_id[1]/@bitmap)",
ctxt))) { ctxt))) {
if (!(classIdMap = virBitmapParseUnlimited(classIdStr))) { if (!(classIdMap = virBitmapParseUnlimited(classIdStr)))
VIR_FREE(classIdStr);
goto error; goto error;
} }
}
VIR_FREE(classIdStr);
floor_sum = virXPathString("string(./floor[1]/@sum)", ctxt); floor_sum = virXPathString("string(./floor[1]/@sum)", ctxt);
if (floor_sum && if (floor_sum &&
@ -922,31 +920,26 @@ virNetworkLoadState(virNetworkObjList *nets,
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("Malformed 'floor_sum' attribute: %s"), _("Malformed 'floor_sum' attribute: %s"),
floor_sum); floor_sum);
VIR_FREE(floor_sum);
goto error; goto error;
} }
VIR_FREE(floor_sum);
if ((n = virXPathNodeSet("./taint", ctxt, &nodes)) < 0) if ((n = virXPathNodeSet("./taint", ctxt, &nodes)) < 0)
goto error; goto error;
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
char *str = virXMLPropString(nodes[i], "flag"); g_autofree char *str = virXMLPropString(nodes[i], "flag");
if (str) { if (str) {
int flag = virNetworkTaintTypeFromString(str); int flag = virNetworkTaintTypeFromString(str);
if (flag < 0) { if (flag < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Unknown taint flag %s"), str); _("Unknown taint flag %s"), str);
VIR_FREE(str);
goto error; goto error;
} }
VIR_FREE(str);
/* Compute taint mask here. The network object does not /* Compute taint mask here. The network object does not
* exist yet, so we can't use virNetworkObjtTaint. */ * exist yet, so we can't use virNetworkObjtTaint. */
taint |= (1 << flag); taint |= (1 << flag);
} }
} }
VIR_FREE(nodes);
} }
/* create the object */ /* create the object */
@ -958,7 +951,7 @@ virNetworkLoadState(virNetworkObjList *nets,
/* assign status data stored in the network object */ /* assign status data stored in the network object */
if (classIdMap) { if (classIdMap) {
virBitmapFree(obj->classIdMap); virBitmapFree(obj->classIdMap);
obj->classIdMap = classIdMap; obj->classIdMap = g_steal_pointer(&classIdMap);
} }
if (floor_sum_val > 0) if (floor_sum_val > 0)
@ -967,17 +960,11 @@ virNetworkLoadState(virNetworkObjList *nets,
obj->taint = taint; obj->taint = taint;
obj->active = true; /* network with a state file is by definition active */ obj->active = true; /* network with a state file is by definition active */
cleanup:
VIR_FREE(configFile);
xmlFreeDoc(xml);
xmlXPathFreeContext(ctxt);
return obj; return obj;
error: error:
VIR_FREE(nodes);
virBitmapFree(classIdMap);
virNetworkDefFree(def); virNetworkDefFree(def);
goto cleanup; return NULL;
} }