NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

conf: Use VIR_AUTOUNREF in domain_conf

Browse Source 
Let's make use of the auto __cleanup capabilities for virObjectUnref
consumers.

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2019-03-01 10:34:50 -05:00
parent c9b1b443a1
commit 145dc7dd8e
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/conf/domain_conf.c
View File

@ -1587,8 +1587,8 @@ void virDomainLeaseDefFree(virDomainLeaseDefPtr def)
static virDomainVcpuDefPtr static virDomainVcpuDefPtr
virDomainVcpuDefNew(virDomainXMLOptionPtr xmlopt) virDomainVcpuDefNew(virDomainXMLOptionPtr xmlopt)
{ {
virObjectPtr priv = NULL;
virDomainVcpuDefPtr ret = NULL; virDomainVcpuDefPtr ret = NULL;
VIR_AUTOUNREF(virObjectPtr) priv = NULL;
if (xmlopt && xmlopt->privateData.vcpuNew && if (xmlopt && xmlopt->privateData.vcpuNew &&
!(priv = xmlopt->privateData.vcpuNew())) !(priv = xmlopt->privateData.vcpuNew()))
@ -1600,7 +1600,6 @@ virDomainVcpuDefNew(virDomainXMLOptionPtr xmlopt)
VIR_STEAL_PTR(ret->privateData, priv); VIR_STEAL_PTR(ret->privateData, priv);
cleanup: cleanup:
virObjectUnref(priv);
return ret; return ret;
} }
@ -19142,13 +19141,13 @@ virDomainCachetuneDefParse(virDomainDefPtr def,
unsigned int flags) unsigned int flags)
{ {
xmlNodePtr oldnode = ctxt->node; xmlNodePtr oldnode = ctxt->node;
virResctrlAllocPtr alloc = NULL;
virDomainResctrlDefPtr resctrl = NULL; virDomainResctrlDefPtr resctrl = NULL;
ssize_t i = 0; ssize_t i = 0;
int n; int n;
int ret = -1; int ret = -1;
VIR_AUTOPTR(virBitmap) vcpus = NULL; VIR_AUTOPTR(virBitmap) vcpus = NULL;
VIR_AUTOFREE(xmlNodePtr *) nodes = NULL; VIR_AUTOFREE(xmlNodePtr *) nodes = NULL;
VIR_AUTOUNREF(virResctrlAllocPtr) alloc = NULL;
ctxt->node = node; ctxt->node = node;
@ -19207,7 +19206,6 @@ virDomainCachetuneDefParse(virDomainDefPtr def,
cleanup: cleanup:
ctxt->node = oldnode; ctxt->node = oldnode;
virDomainResctrlDefFree(resctrl); virDomainResctrlDefFree(resctrl);
virObjectUnref(alloc);
return ret; return ret;
} }
@ -19353,10 +19351,10 @@ virDomainMemorytuneDefParse(virDomainDefPtr def,
unsigned int flags) unsigned int flags)
{ {
xmlNodePtr oldnode = ctxt->node; xmlNodePtr oldnode = ctxt->node;
virResctrlAllocPtr alloc = NULL;
virDomainResctrlDefPtr resctrl = NULL; virDomainResctrlDefPtr resctrl = NULL;
VIR_AUTOPTR(virBitmap) vcpus = NULL; VIR_AUTOPTR(virBitmap) vcpus = NULL;
VIR_AUTOFREE(xmlNodePtr *) nodes = NULL; VIR_AUTOFREE(xmlNodePtr *) nodes = NULL;
VIR_AUTOUNREF(virResctrlAllocPtr) alloc = NULL;
ssize_t i = 0; ssize_t i = 0;
int n; int n;
@ -19414,7 +19412,6 @@ virDomainMemorytuneDefParse(virDomainDefPtr def,
cleanup: cleanup:
ctxt->node = oldnode; ctxt->node = oldnode;
virDomainResctrlDefFree(resctrl); virDomainResctrlDefFree(resctrl);
virObjectUnref(alloc);
return ret; return ret;
} }
@ -30460,11 +30457,11 @@ virDomainNetBandwidthUpdate(virDomainNetDefPtr iface,
int int
virDomainNetResolveActualType(virDomainNetDefPtr iface) virDomainNetResolveActualType(virDomainNetDefPtr iface)
{ {
virConnectPtr conn = NULL;
virNetworkPtr net = NULL;
virNetworkDefPtr def = NULL; virNetworkDefPtr def = NULL;
int ret = -1; int ret = -1;
VIR_AUTOFREE(char *) xml = NULL; VIR_AUTOFREE(char *) xml = NULL;
VIR_AUTOUNREF(virConnectPtr) conn = NULL;
VIR_AUTOUNREF(virNetworkPtr) net = NULL;
if (iface->type != VIR_DOMAIN_NET_TYPE_NETWORK) if (iface->type != VIR_DOMAIN_NET_TYPE_NETWORK)
return iface->type; return iface->type;
@ -30531,8 +30528,6 @@ virDomainNetResolveActualType(virDomainNetDefPtr iface)
cleanup: cleanup:
virNetworkDefFree(def); virNetworkDefFree(def);
virObjectUnref(conn);
virObjectUnref(net);
return ret; return ret;
} }
@ -30656,13 +30651,13 @@ virDomainDiskTranslateISCSIDirect(virDomainDiskDefPtr def,
int int
virDomainDiskTranslateSourcePool(virDomainDiskDefPtr def) virDomainDiskTranslateSourcePool(virDomainDiskDefPtr def)
{ {
virConnectPtr conn = NULL;
virStoragePoolPtr pool = NULL;
virStorageVolPtr vol = NULL;
virStorageVolInfo info; virStorageVolInfo info;
int ret = -1; int ret = -1;
VIR_AUTOPTR(virStoragePoolDef) pooldef = NULL; VIR_AUTOPTR(virStoragePoolDef) pooldef = NULL;
VIR_AUTOFREE(char *) poolxml = NULL; VIR_AUTOFREE(char *) poolxml = NULL;
VIR_AUTOUNREF(virConnectPtr) conn = NULL;
VIR_AUTOUNREF(virStoragePoolPtr) pool = NULL;
VIR_AUTOUNREF(virStorageVolPtr) vol = NULL;
if (def->src->type != VIR_STORAGE_TYPE_VOLUME) if (def->src->type != VIR_STORAGE_TYPE_VOLUME)
return 0; return 0;
@ -30817,9 +30812,6 @@ virDomainDiskTranslateSourcePool(virDomainDiskDefPtr def)
ret = 0; ret = 0;
cleanup: cleanup:
virObjectUnref(conn);
virObjectUnref(pool);
virObjectUnref(vol);
return ret; return ret;
} }