External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 03:12:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: replace explicit virNetworkDefFree() with g_autoptr(virNetworkDef)

Browse Source 
Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Laine Stump 2022-08-18 13:24:41 -04:00
parent 915d566f42
commit f172de14fe
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/conf/domain_conf.c
View File

@ -29891,7 +29891,7 @@ virDomainNetBandwidthUpdate(virDomainNetDef *iface,
int int
virDomainNetResolveActualType(virDomainNetDef *iface) virDomainNetResolveActualType(virDomainNetDef *iface)
{ {
virNetworkDef *def = NULL; g_autoptr(virNetworkDef) def = NULL;
int ret = -1; int ret = -1;
g_autofree char *xml = NULL; g_autofree char *xml = NULL;
g_autoptr(virConnect) conn = NULL; g_autoptr(virConnect) conn = NULL;
@ -29961,7 +29961,6 @@ virDomainNetResolveActualType(virDomainNetDef *iface)
} }
cleanup: cleanup:
virNetworkDefFree(def);
return ret; return ret;
} }

21
src/conf/virnetworkobj.c
View File

@ -843,7 +843,7 @@ virNetworkLoadState(virNetworkObjList *nets,
virNetworkXMLOption *xmlopt) virNetworkXMLOption *xmlopt)
{ {
g_autofree char *configFile = NULL; g_autofree char *configFile = NULL;
virNetworkDef *def = NULL; g_autoptr(virNetworkDef) def = NULL;
virNetworkObj *obj = NULL; virNetworkObj *obj = NULL;
g_autoptr(xmlDoc) xml = NULL; g_autoptr(xmlDoc) xml = NULL;
xmlNodePtr node = NULL; xmlNodePtr node = NULL;
@ -929,6 +929,7 @@ virNetworkLoadState(virNetworkObjList *nets,
VIR_NETWORK_OBJ_LIST_ADD_LIVE))) VIR_NETWORK_OBJ_LIST_ADD_LIVE)))
goto error; goto error;
/* do not put any "goto error" below this comment */ /* do not put any "goto error" below this comment */
def = NULL;
/* assign status data stored in the network object */ /* assign status data stored in the network object */
if (classIdMap) { if (classIdMap) {
@ -945,7 +946,6 @@ virNetworkLoadState(virNetworkObjList *nets,
return obj; return obj;
error: error:
virNetworkDefFree(def);
return NULL; return NULL;
} }
@ -958,7 +958,7 @@ virNetworkLoadConfig(virNetworkObjList *nets,
virNetworkXMLOption *xmlopt) virNetworkXMLOption *xmlopt)
{ {
char *configFile = NULL, *autostartLink = NULL; char *configFile = NULL, *autostartLink = NULL;
virNetworkDef *def = NULL; g_autoptr(virNetworkDef) def = NULL;
virNetworkObj *obj; virNetworkObj *obj;
bool saveConfig = false; bool saveConfig = false;
int autostart; int autostart;
@ -1026,6 +1026,8 @@ virNetworkLoadConfig(virNetworkObjList *nets,
if (!(obj = virNetworkObjAssignDef(nets, def, 0))) if (!(obj = virNetworkObjAssignDef(nets, def, 0)))
goto error; goto error;
def = NULL;
obj->autostart = (autostart == 1); obj->autostart = (autostart == 1);
VIR_FREE(configFile); VIR_FREE(configFile);
@ -1036,7 +1038,6 @@ virNetworkLoadConfig(virNetworkObjList *nets,
error: error:
VIR_FREE(configFile); VIR_FREE(configFile);
VIR_FREE(autostartLink); VIR_FREE(autostartLink);
virNetworkDefFree(def);
return NULL; return NULL;
} }
@ -1213,15 +1214,15 @@ virNetworkObjUpdate(virNetworkObj *obj,
unsigned int flags) /* virNetworkUpdateFlags */ unsigned int flags) /* virNetworkUpdateFlags */
{ {
int ret = -1; int ret = -1;
virNetworkDef *livedef = NULL; g_autoptr(virNetworkDef) livedef = NULL;
virNetworkDef *configdef = NULL; g_autoptr(virNetworkDef) configdef = NULL;
/* normalize config data, and check for common invalid requests. */ /* normalize config data, and check for common invalid requests. */
if (virNetworkObjConfigChangeSetup(obj, xmlopt, flags) < 0) if (virNetworkObjConfigChangeSetup(obj, xmlopt, flags) < 0)
goto cleanup; goto cleanup;
if (flags & VIR_NETWORK_UPDATE_AFFECT_LIVE) { if (flags & VIR_NETWORK_UPDATE_AFFECT_LIVE) {
virNetworkDef *checkdef; g_autoptr(virNetworkDef) checkdef = NULL;
/* work on a copy of the def */ /* work on a copy of the def */
if (!(livedef = virNetworkDefCopy(obj->def, xmlopt, 0))) if (!(livedef = virNetworkDefCopy(obj->def, xmlopt, 0)))
@ -1235,11 +1236,10 @@ virNetworkObjUpdate(virNetworkObj *obj,
*/ */
if (!(checkdef = virNetworkDefCopy(livedef, xmlopt, 0))) if (!(checkdef = virNetworkDefCopy(livedef, xmlopt, 0)))
goto cleanup; goto cleanup;
virNetworkDefFree(checkdef);
} }
if (flags & VIR_NETWORK_UPDATE_AFFECT_CONFIG) { if (flags & VIR_NETWORK_UPDATE_AFFECT_CONFIG) {
virNetworkDef *checkdef; g_autoptr(virNetworkDef) checkdef = NULL;
/* work on a copy of the def */ /* work on a copy of the def */
if (!(configdef = virNetworkDefCopy(virNetworkObjGetPersistentDef(obj), if (!(configdef = virNetworkDefCopy(virNetworkObjGetPersistentDef(obj),
@ -1256,7 +1256,6 @@ virNetworkObjUpdate(virNetworkObj *obj,
VIR_NETWORK_XML_INACTIVE))) { VIR_NETWORK_XML_INACTIVE))) {
goto cleanup; goto cleanup;
} }
virNetworkDefFree(checkdef);
} }
if (configdef) { if (configdef) {
@ -1273,8 +1272,6 @@ virNetworkObjUpdate(virNetworkObj *obj,
ret = 0; ret = 0;
cleanup: cleanup:
virNetworkDefFree(livedef);
virNetworkDefFree(configdef);
return ret; return ret;
} }