10:26 a.m.
v2: https://www.redhat.com/archives/libvir-list/2019-February/msg01201.html
Changes since v2:
Patches 1-5 are marked w/ reviewed-by
Added patch 6 to add a few more VIR_AUTOFREE on char *'s that I missed
in the first passes - these would be merged with previous after a
successful review.
Added patch 7 to add VIR_AUTOUNREF.
Patch 8 is unchanged from previous patch 6
Patch 9 is more places where cleanup could occur from code review and
from the VIR_AUTOUNREF change
Patch 10 is a change to virDomainKeyWrapDefParseXML as requested as part
of the code review
Other requests for more VIR_AUTOPTR usage should be done right and at
a later point.
Usage of VIR_XPATH_NODE_AUTORESTORE would also have to wait since
those changes aren't pushed yet, but that could lead to *a lot* more
cleanup in domain_conf.
John Ferlan (10):
conf: Rework virDomainEmulatorPinDefParseXML
conf: Use VIR_AUTOPTR(virBitmap) in domain_conf
conf: Clean up some unnecessary goto paths
conf: Remove a few unused variables in domain_conf
conf: Use VIR_AUTOFREE in domain_conf
conf: Merge with previous
conf: Use VIR_AUTOUNREF in domain_conf
conf: Clean up some unnecessary goto paths
conf: Merge with previous
conf: Rework virDomainKeyWrapDefParseXML
src/conf/domain_conf.c | 2080 ++++++++++++++--------------------------
1 file changed, 731 insertions(+), 1349 deletions(-)
--
2.20.1
10:26 a.m.
New subject: [libvirt] [PATCH v3 01/10] conf: Rework virDomainEmulatorPinDefParseXML
In preparation for using auto free mechanism, change to using the
VIR_STEAL_PTR on @def to @ret and of course be sure to properly clean
up @def in cleanup.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
Reviewed-by: Erik Skultety <eskultet(a)redhat.com>
---
src/conf/domain_conf.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 477deb777e..9b0dbe3c91 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -18397,6 +18397,7 @@ static virBitmapPtr
virDomainEmulatorPinDefParseXML(xmlNodePtr node)
{
virBitmapPtr def = NULL;
+ virBitmapPtr ret = NULL;
char *tmp = NULL;
if (!(tmp = virXMLPropString(node, "cpuset"))) {
@@ -18411,14 +18412,15 @@ virDomainEmulatorPinDefParseXML(xmlNodePtr node)
if (virBitmapIsAllClear(def)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Invalid value of 'cpuset': %s"), tmp);
- virBitmapFree(def);
- def = NULL;
goto cleanup;
}
+ VIR_STEAL_PTR(ret, def);
+
cleanup:
+ virBitmapFree(def);
VIR_FREE(tmp);
- return def;
+ return ret;
}
--
2.20.1
6:50 a.m.
New subject: [libvirt] [PATCH v3 01/10] conf: Rework virDomainEmulatorPinDefParseXML
On Fri, Mar 01, 2019 at 11:26:43AM -0500, John Ferlan wrote:
In preparation for using auto free mechanism, change to using the
VIR_STEAL_PTR on @def to @ret and of course be sure to properly clean
up @def in cleanup.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
Reviewed-by: Erik Skultety <eskultet(a)redhat.com>
---
src/conf/domain_conf.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
10:26 a.m.
New subject: [libvirt] [PATCH v3 02/10] conf: Use VIR_AUTOPTR(virBitmap) in domain_conf
Let's make use of the auto __cleanup capabilities for virBitmapPtr.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
Reviewed-by: Erik Skultety <eskultet(a)redhat.com>
---
src/conf/domain_conf.c | 21 +++++++--------------
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 9b0dbe3c91..fae0fa7dc0 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -1809,8 +1809,8 @@ virDomainDefGetVcpuPinInfoHelper(virDomainDefPtr def,
virBitmapPtr autoCpuset)
{
int maxvcpus = virDomainDefGetVcpusMax(def);
- virBitmapPtr allcpumap = NULL;
size_t i;
+ VIR_AUTOPTR(virBitmap) allcpumap = NULL;
if (hostcpus < 0)
return -1;
@@ -1837,7 +1837,6 @@ virDomainDefGetVcpuPinInfoHelper(virDomainDefPtr def,
virBitmapToDataBuf(bitmap, VIR_GET_CPUMAP(cpumaps, maplen, i), maplen);
}
- virBitmapFree(allcpumap);
return i;
}
@@ -2987,7 +2986,7 @@ virDomainIOThreadIDDefArrayInit(virDomainDefPtr def,
size_t i;
ssize_t nxt = -1;
virDomainIOThreadIDDefPtr iothrid = NULL;
- virBitmapPtr thrmap = NULL;
+ VIR_AUTOPTR(virBitmap) thrmap = NULL;
/* Same value (either 0 or some number), then we have none to fill in or
* the iothreadid array was filled from the XML
@@ -3028,7 +3027,6 @@ virDomainIOThreadIDDefArrayInit(virDomainDefPtr def,
retval = 0;
error:
- virBitmapFree(thrmap);
return retval;
}
@@ -18326,9 +18324,9 @@ virDomainIOThreadPinDefParseXML(xmlNodePtr node,
{
int ret = -1;
virDomainIOThreadIDDefPtr iothrid;
- virBitmapPtr cpumask = NULL;
unsigned int iothreadid;
char *tmp = NULL;
+ VIR_AUTOPTR(virBitmap) cpumask = NULL;
if (!(tmp = virXMLPropString(node, "iothread"))) {
virReportError(VIR_ERR_XML_ERROR, "%s",
@@ -18384,7 +18382,6 @@ virDomainIOThreadPinDefParseXML(xmlNodePtr node,
cleanup:
VIR_FREE(tmp);
- virBitmapFree(cpumask);
return ret;
}
@@ -18396,9 +18393,9 @@ virDomainIOThreadPinDefParseXML(xmlNodePtr node,
static virBitmapPtr
virDomainEmulatorPinDefParseXML(xmlNodePtr node)
{
- virBitmapPtr def = NULL;
virBitmapPtr ret = NULL;
char *tmp = NULL;
+ VIR_AUTOPTR(virBitmap) def = NULL;
if (!(tmp = virXMLPropString(node, "cpuset"))) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@@ -18418,7 +18415,6 @@ virDomainEmulatorPinDefParseXML(xmlNodePtr node)
VIR_STEAL_PTR(ret, def);
cleanup:
- virBitmapFree(def);
VIR_FREE(tmp);
return ret;
}
@@ -18779,11 +18775,11 @@ virDomainThreadSchedParseHelper(xmlNodePtr node,
virDomainDefPtr def)
{
ssize_t next = -1;
- virBitmapPtr map = NULL;
virDomainThreadSchedParamPtr sched;
virProcessSchedPolicy policy;
int priority;
int ret = -1;
+ VIR_AUTOPTR(virBitmap) map = NULL;
if (!(map = virDomainSchedulerParse(node, name, &policy, &priority)))
goto cleanup;
@@ -18806,7 +18802,6 @@ virDomainThreadSchedParseHelper(xmlNodePtr node,
ret = 0;
cleanup:
- virBitmapFree(map);
return ret;
}
@@ -19510,12 +19505,12 @@ virDomainCachetuneDefParse(virDomainDefPtr def,
{
xmlNodePtr oldnode = ctxt->node;
xmlNodePtr *nodes = NULL;
- virBitmapPtr vcpus = NULL;
virResctrlAllocPtr alloc = NULL;
virDomainResctrlDefPtr resctrl = NULL;
ssize_t i = 0;
int n;
int ret = -1;
+ VIR_AUTOPTR(virBitmap) vcpus = NULL;
ctxt->node = node;
@@ -19575,7 +19570,6 @@ virDomainCachetuneDefParse(virDomainDefPtr def,
ctxt->node = oldnode;
virDomainResctrlDefFree(resctrl);
virObjectUnref(alloc);
- virBitmapFree(vcpus);
VIR_FREE(nodes);
return ret;
}
@@ -19729,9 +19723,9 @@ virDomainMemorytuneDefParse(virDomainDefPtr def,
{
xmlNodePtr oldnode = ctxt->node;
xmlNodePtr *nodes = NULL;
- virBitmapPtr vcpus = NULL;
virResctrlAllocPtr alloc = NULL;
virDomainResctrlDefPtr resctrl = NULL;
+ VIR_AUTOPTR(virBitmap) vcpus = NULL;
ssize_t i = 0;
int n;
@@ -19790,7 +19784,6 @@ virDomainMemorytuneDefParse(virDomainDefPtr def,
ctxt->node = oldnode;
virDomainResctrlDefFree(resctrl);
virObjectUnref(alloc);
- virBitmapFree(vcpus);
VIR_FREE(nodes);
return ret;
}
--
2.20.1
6:50 a.m.
New subject: [libvirt] [PATCH v3 02/10] conf: Use VIR_AUTOPTR(virBitmap) in domain_conf
On Fri, Mar 01, 2019 at 11:26:44AM -0500, John Ferlan wrote:
Let's make use of the auto __cleanup capabilities for
virBitmapPtr.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
Reviewed-by: Erik Skultety <eskultet(a)redhat.com>
---
src/conf/domain_conf.c | 21 +++++++--------------
1 file changed, 7 insertions(+), 14 deletions(-)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
10:26 a.m.
New subject: [libvirt] [PATCH v3 03/10] conf: Clean up some unnecessary goto paths
Now that we're using VIR_AUTOPTR(virBitmap) there's a couple of methods
that we can clean up some now unnecessary goto paths.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
Reviewed-by: Erik Skultety <eskultet(a)redhat.com>
---
src/conf/domain_conf.c | 26 +++++++++-----------------
1 file changed, 9 insertions(+), 17 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index fae0fa7dc0..30d678c8d9 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -2982,7 +2982,6 @@ static int
virDomainIOThreadIDDefArrayInit(virDomainDefPtr def,
unsigned int iothreads)
{
- int retval = -1;
size_t i;
ssize_t nxt = -1;
virDomainIOThreadIDDefPtr iothrid = NULL;
@@ -2996,7 +2995,7 @@ virDomainIOThreadIDDefArrayInit(virDomainDefPtr def,
/* iothread's are numbered starting at 1, account for that */
if (!(thrmap = virBitmapNew(iothreads + 1)))
- goto error;
+ return -1;
virBitmapSetAll(thrmap);
/* Clear 0 since we don't use it, then mark those which are
@@ -3008,26 +3007,23 @@ virDomainIOThreadIDDefArrayInit(virDomainDefPtr def,
/* resize array */
if (VIR_REALLOC_N(def->iothreadids, iothreads) < 0)
- goto error;
+ return -1;
/* Populate iothreadids[] using the set bit number from thrmap */
while (def->niothreadids < iothreads) {
if ((nxt = virBitmapNextSetBit(thrmap, nxt)) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("failed to populate iothreadids"));
- goto error;
+ return -1;
}
if (VIR_ALLOC(iothrid) < 0)
- goto error;
+ return -1;
iothrid->iothread_id = nxt;
iothrid->autofill = true;
def->iothreadids[def->niothreadids++] = iothrid;
}
- retval = 0;
-
- error:
- return retval;
+ return 0;
}
@@ -18778,31 +18774,27 @@ virDomainThreadSchedParseHelper(xmlNodePtr node,
virDomainThreadSchedParamPtr sched;
virProcessSchedPolicy policy;
int priority;
- int ret = -1;
VIR_AUTOPTR(virBitmap) map = NULL;
if (!(map = virDomainSchedulerParse(node, name, &policy, &priority)))
- goto cleanup;
+ return -1;
while ((next = virBitmapNextSetBit(map, next)) > -1) {
if (!(sched = func(def, next)))
- goto cleanup;
+ return -1;
if (sched->policy != VIR_PROC_POLICY_NONE) {
virReportError(VIR_ERR_XML_DETAIL,
_("%ssched attributes 'vcpus' must not
overlap"),
name);
- goto cleanup;
+ return -1;
}
sched->policy = policy;
sched->priority = priority;
}
- ret = 0;
-
- cleanup:
- return ret;
+ return 0;
}
--
2.20.1
6:51 a.m.
New subject: [libvirt] [PATCH v3 03/10] conf: Clean up some unnecessary goto paths
On Fri, Mar 01, 2019 at 11:26:45AM -0500, John Ferlan wrote:
Now that we're using VIR_AUTOPTR(virBitmap) there's a couple
of methods
that we can clean up some now unnecessary goto paths.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
Reviewed-by: Erik Skultety <eskultet(a)redhat.com>
---
src/conf/domain_conf.c | 26 +++++++++-----------------
1 file changed, 9 insertions(+), 17 deletions(-)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
10:26 a.m.
New subject: [libvirt] [PATCH v3 04/10] conf: Remove a few unused variables in domain_conf
In preparation for VIR_AUTOFREE usage, let's remove a couple
of unused variables so that clang compilations won't fail.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
Reviewed-by: Erik Skultety <eskultet(a)redhat.com>
---
src/conf/domain_conf.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 30d678c8d9..cbaa32e174 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -7137,7 +7137,6 @@ virDomainDeviceInfoParseXML(virDomainXMLOptionPtr xmlopt
ATTRIBUTE_UNUSED,
xmlNodePtr alias = NULL;
xmlNodePtr boot = NULL;
xmlNodePtr rom = NULL;
- char *type = NULL;
char *romenabled = NULL;
char *rombar = NULL;
char *aliasStr = NULL;
@@ -7223,7 +7222,6 @@ virDomainDeviceInfoParseXML(virDomainXMLOptionPtr xmlopt
ATTRIBUTE_UNUSED,
cleanup:
if (ret < 0)
virDomainDeviceInfoClear(info);
- VIR_FREE(type);
VIR_FREE(rombar);
VIR_FREE(romenabled);
VIR_FREE(aliasStr);
@@ -13011,7 +13009,6 @@ virDomainTPMDefParseXML(virDomainXMLOptionPtr xmlopt,
xmlXPathContextPtr ctxt,
unsigned int flags)
{
- char *type = NULL;
char *path = NULL;
char *model = NULL;
char *backend = NULL;
@@ -13092,7 +13089,6 @@ virDomainTPMDefParseXML(virDomainXMLOptionPtr xmlopt,
goto error;
cleanup:
- VIR_FREE(type);
VIR_FREE(path);
VIR_FREE(model);
VIR_FREE(backend);
@@ -18547,7 +18543,7 @@ virDomainHugepagesParseXML(xmlNodePtr node,
{
int ret = -1;
xmlNodePtr oldnode = ctxt->node;
- char *unit = NULL, *nodeset = NULL;
+ char *nodeset = NULL;
ctxt->node = node;
@@ -18575,7 +18571,6 @@ virDomainHugepagesParseXML(xmlNodePtr node,
ret = 0;
cleanup:
- VIR_FREE(unit);
VIR_FREE(nodeset);
ctxt->node = oldnode;
return ret;
--
2.20.1
6:51 a.m.
New subject: [libvirt] [PATCH v3 04/10] conf: Remove a few unused variables in domain_conf
On Fri, Mar 01, 2019 at 11:26:46AM -0500, John Ferlan wrote:
In preparation for VIR_AUTOFREE usage, let's remove a couple
of unused variables so that clang compilations won't fail.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
Reviewed-by: Erik Skultety <eskultet(a)redhat.com>
---
src/conf/domain_conf.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
10:26 a.m.
New subject: [libvirt] [PATCH v3 05/10] conf: Use VIR_AUTOFREE in domain_conf
Let's make use of the auto __cleanup capabilities for VIR_FREE consumers.
In some cases adding or removing blank lines for readability.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
Reviewed-by: Erik Skultety <eskultet(a)redhat.com>
---
src/conf/domain_conf.c | 1080 +++++++++++++---------------------------
1 file changed, 347 insertions(+), 733 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index cbaa32e174..c06c52271c 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -1105,11 +1105,11 @@ static int
virDomainKeyWrapCipherDefParseXML(virDomainKeyWrapDefPtr keywrap,
xmlNodePtr node)
{
- char *name = NULL;
- char *state = NULL;
int state_type;
int name_type;
int ret = -1;
+ VIR_AUTOFREE(char *) name = NULL;
+ VIR_AUTOFREE(char *) state = NULL;
if (!(name = virXMLPropString(node, "name"))) {
virReportError(VIR_ERR_CONF_SYNTAX, "%s",
@@ -1167,8 +1167,6 @@ virDomainKeyWrapCipherDefParseXML(virDomainKeyWrapDefPtr keywrap,
ret = 0;
cleanup:
- VIR_FREE(name);
- VIR_FREE(state);
return ret;
}
@@ -1177,8 +1175,8 @@ virDomainKeyWrapDefParseXML(virDomainDefPtr def, xmlXPathContextPtr
ctxt)
{
size_t i;
int ret = -1;
- xmlNodePtr *nodes = NULL;
int n;
+ VIR_AUTOFREE(xmlNodePtr *) nodes = NULL;
if ((n = virXPathNodeSet("./keywrap/cipher", ctxt, &nodes)) < 0)
return n;
@@ -1200,7 +1198,6 @@ virDomainKeyWrapDefParseXML(virDomainDefPtr def, xmlXPathContextPtr
ctxt)
cleanup:
if (ret < 0)
VIR_FREE(def->keywrap);
- VIR_FREE(nodes);
return ret;
}
@@ -1273,10 +1270,10 @@ static int
virDomainVirtioOptionsParseXML(xmlNodePtr driver,
virDomainVirtioOptionsPtr *virtio)
{
- char *str = NULL;
int ret = -1;
int val;
virDomainVirtioOptionsPtr res;
+ VIR_AUTOFREE(char *) str = NULL;
if (*virtio || !driver)
return 0;
@@ -1308,7 +1305,6 @@ virDomainVirtioOptionsParseXML(xmlNodePtr driver,
ret = 0;
cleanup:
- VIR_FREE(str);
return ret;
}
@@ -1350,8 +1346,8 @@ static int
virDomainBlkioDeviceParseXML(xmlNodePtr root,
virBlkioDevicePtr dev)
{
- char *c = NULL;
xmlNodePtr node;
+ VIR_AUTOFREE(char *) c = NULL;
node = root->children;
while (node) {
@@ -1416,7 +1412,6 @@ virDomainBlkioDeviceParseXML(xmlNodePtr root,
return 0;
error:
- VIR_FREE(c);
VIR_FREE(dev->path);
return -1;
}
@@ -5337,8 +5332,8 @@ virDomainDefCollectBootOrder(virDomainDefPtr def ATTRIBUTE_UNUSED,
void *data)
{
virHashTablePtr bootHash = data;
- char *order = NULL;
int ret = -1;
+ VIR_AUTOFREE(char *) order = NULL;
if (info->bootIndex == 0)
return 0;
@@ -5367,7 +5362,6 @@ virDomainDefCollectBootOrder(virDomainDefPtr def ATTRIBUTE_UNUSED,
ret = 0;
cleanup:
- VIR_FREE(order);
return ret;
}
@@ -6888,8 +6882,8 @@ static int
virDomainDeviceUSBMasterParseXML(xmlNodePtr node,
virDomainDeviceUSBMasterPtr master)
{
- char *startport;
int ret = -1;
+ VIR_AUTOFREE(char *) startport = NULL;
memset(master, 0, sizeof(*master));
@@ -6905,7 +6899,6 @@ virDomainDeviceUSBMasterParseXML(xmlNodePtr node,
ret = 0;
cleanup:
- VIR_FREE(startport);
return ret;
}
@@ -6913,9 +6906,9 @@ static int
virDomainDeviceBootParseXML(xmlNodePtr node,
virDomainDeviceInfoPtr info)
{
- char *order;
- char *loadparm = NULL;
int ret = -1;
+ VIR_AUTOFREE(char *) order = NULL;
+ VIR_AUTOFREE(char *) loadparm = NULL;
if (!(order = virXMLPropString(node, "order"))) {
virReportError(VIR_ERR_INTERNAL_ERROR,
@@ -6949,8 +6942,6 @@ virDomainDeviceBootParseXML(xmlNodePtr node,
ret = 0;
cleanup:
- VIR_FREE(order);
- VIR_FREE(loadparm);
return ret;
}
@@ -6959,8 +6950,8 @@ virDomainDeviceISAAddressParseXML(xmlNodePtr node,
virDomainDeviceISAAddressPtr addr)
{
int ret = -1;
- char *iobase;
- char *irq;
+ VIR_AUTOFREE(char *) iobase = NULL;
+ VIR_AUTOFREE(char *) irq = NULL;
memset(addr, 0, sizeof(*addr));
@@ -6983,8 +6974,6 @@ virDomainDeviceISAAddressParseXML(xmlNodePtr node,
ret = 0;
cleanup:
- VIR_FREE(iobase);
- VIR_FREE(irq);
return ret;
}
@@ -6994,7 +6983,7 @@ virDomainDeviceDimmAddressParseXML(xmlNodePtr node,
virDomainDeviceDimmAddressPtr addr)
{
int ret = -1;
- char *tmp = NULL;
+ VIR_AUTOFREE(char *) tmp = NULL;
if (!(tmp = virXMLPropString(node, "slot")) ||
virStrToLong_uip(tmp, NULL, 10, &addr->slot) < 0) {
@@ -7011,15 +7000,11 @@ virDomainDeviceDimmAddressParseXML(xmlNodePtr node,
_("invalid dimm base address '%s'"), tmp);
goto cleanup;
}
-
- VIR_FREE(tmp);
}
ret = 0;
cleanup:
- VIR_FREE(tmp);
-
return ret;
}
@@ -7029,7 +7014,7 @@ virDomainDeviceAddressParseXML(xmlNodePtr address,
virDomainDeviceInfoPtr info)
{
int ret = -1;
- char *type = virXMLPropString(address, "type");
+ VIR_AUTOFREE(char *) type = virXMLPropString(address, "type");
if (type) {
if ((info->type = virDomainDeviceAddressTypeFromString(type)) <= 0) {
@@ -7106,7 +7091,6 @@ virDomainDeviceAddressParseXML(xmlNodePtr address,
ret = 0;
cleanup:
- VIR_FREE(type);
return ret;
}
@@ -7137,10 +7121,10 @@ virDomainDeviceInfoParseXML(virDomainXMLOptionPtr xmlopt
ATTRIBUTE_UNUSED,
xmlNodePtr alias = NULL;
xmlNodePtr boot = NULL;
xmlNodePtr rom = NULL;
- char *romenabled = NULL;
- char *rombar = NULL;
- char *aliasStr = NULL;
int ret = -1;
+ VIR_AUTOFREE(char *) romenabled = NULL;
+ VIR_AUTOFREE(char *) rombar = NULL;
+ VIR_AUTOFREE(char *) aliasStr = NULL;
virDomainDeviceInfoClear(info);
@@ -7222,9 +7206,6 @@ virDomainDeviceInfoParseXML(virDomainXMLOptionPtr xmlopt
ATTRIBUTE_UNUSED,
cleanup:
if (ret < 0)
virDomainDeviceInfoClear(info);
- VIR_FREE(rombar);
- VIR_FREE(romenabled);
- VIR_FREE(aliasStr);
return ret;
}
@@ -7253,9 +7234,9 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node,
int ret = -1;
bool got_product, got_vendor;
xmlNodePtr cur;
- char *startupPolicy = NULL;
- char *autoAddress;
virDomainHostdevSubsysUSBPtr usbsrc = &def->source.subsys.u.usb;
+ VIR_AUTOFREE(char *) startupPolicy = NULL;
+ VIR_AUTOFREE(char *) autoAddress = NULL;
if ((startupPolicy = virXMLPropString(node, "startupPolicy"))) {
def->startupPolicy =
@@ -7264,16 +7245,13 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Unknown startup policy '%s'"),
startupPolicy);
- VIR_FREE(startupPolicy);
goto out;
}
- VIR_FREE(startupPolicy);
}
if ((autoAddress = virXMLPropString(node, "autoAddress"))) {
if (STREQ(autoAddress, "yes"))
usbsrc->autoAddress = true;
- VIR_FREE(autoAddress);
}
/* Product can validly be 0, so we need some extra help to determine
@@ -7285,24 +7263,22 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node,
while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE) {
if (virXMLNodeNameEqual(cur, "vendor")) {
- char *vendor = virXMLPropString(cur, "id");
+ VIR_AUTOFREE(char *) vendor = virXMLPropString(cur, "id");
if (vendor) {
got_vendor = true;
if (virStrToLong_ui(vendor, NULL, 0, &usbsrc->vendor) < 0)
{
virReportError(VIR_ERR_INTERNAL_ERROR,
_("cannot parse vendor id %s"),
vendor);
- VIR_FREE(vendor);
goto out;
}
- VIR_FREE(vendor);
} else {
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("usb vendor needs id"));
goto out;
}
} else if (virXMLNodeNameEqual(cur, "product")) {
- char* product = virXMLPropString(cur, "id");
+ VIR_AUTOFREE(char *) product = virXMLPropString(cur, "id");
if (product) {
got_product = true;
@@ -7311,27 +7287,24 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node,
virReportError(VIR_ERR_INTERNAL_ERROR,
_("cannot parse product %s"),
product);
- VIR_FREE(product);
goto out;
}
- VIR_FREE(product);
} else {
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("usb product needs id"));
goto out;
}
} else if (virXMLNodeNameEqual(cur, "address")) {
- char *bus, *device;
+ VIR_AUTOFREE(char *) bus = NULL;
+ VIR_AUTOFREE(char *) device = NULL;
bus = virXMLPropString(cur, "bus");
if (bus) {
if (virStrToLong_ui(bus, NULL, 0, &usbsrc->bus) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("cannot parse bus %s"), bus);
- VIR_FREE(bus);
goto out;
}
- VIR_FREE(bus);
} else {
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("usb address needs bus
id"));
@@ -7344,10 +7317,8 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node,
virReportError(VIR_ERR_INTERNAL_ERROR,
_("cannot parse device %s"),
device);
- VIR_FREE(device);
goto out;
}
- VIR_FREE(device);
} else {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("usb address needs device id"));
@@ -7441,14 +7412,13 @@ virDomainHostdevSubsysPCIDefParseXML(xmlNodePtr node,
} else if ((flags & VIR_DOMAIN_DEF_PARSE_STATUS) &&
virXMLNodeNameEqual(cur, "state")) {
/* Legacy back-compat. Don't add any more attributes here */
- char *devaddr = virXMLPropString(cur, "devaddr");
+ VIR_AUTOFREE(char *) devaddr = virXMLPropString(cur,
"devaddr");
if (devaddr &&
virDomainParseLegacyDeviceAddress(devaddr,
&def->info->addr.pci)
< 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Unable to parse devaddr parameter
'%s'"),
devaddr);
- VIR_FREE(devaddr);
goto out;
}
def->info->type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI;
@@ -7479,9 +7449,9 @@ virDomainStorageNetworkParseHost(xmlNodePtr hostnode,
size_t *nhosts)
{
int ret = -1;
- char *transport = NULL;
- char *port = NULL;
virStorageNetHostDef host;
+ VIR_AUTOFREE(char *) transport = NULL;
+ VIR_AUTOFREE(char *) port = NULL;
memset(&host, 0, sizeof(host));
host.transport = VIR_STORAGE_NET_HOST_TRANS_TCP;
@@ -7535,8 +7505,6 @@ virDomainStorageNetworkParseHost(xmlNodePtr hostnode,
cleanup:
virStorageNetHostDefClear(&host);
- VIR_FREE(transport);
- VIR_FREE(port);
return ret;
}
@@ -7568,8 +7536,10 @@ virDomainHostdevSubsysSCSIHostDefParseXML(xmlNodePtr sourcenode,
int ret = -1;
bool got_address = false, got_adapter = false;
xmlNodePtr cur;
- char *bus = NULL, *target = NULL, *unit = NULL;
virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host;
+ VIR_AUTOFREE(char *) bus = NULL;
+ VIR_AUTOFREE(char *) target = NULL;
+ VIR_AUTOFREE(char *) unit = NULL;
cur = sourcenode->children;
while (cur != NULL) {
@@ -7644,9 +7614,6 @@ virDomainHostdevSubsysSCSIHostDefParseXML(xmlNodePtr sourcenode,
ret = 0;
cleanup:
- VIR_FREE(bus);
- VIR_FREE(target);
- VIR_FREE(unit);
return ret;
}
@@ -7726,8 +7693,8 @@ virDomainHostdevSubsysSCSIDefParseXML(xmlNodePtr sourcenode,
virDomainHostdevSubsysSCSIPtr scsisrc,
xmlXPathContextPtr ctxt)
{
- char *protocol = NULL;
int ret = -1;
+ VIR_AUTOFREE(char *) protocol = NULL;
if ((protocol = virXMLPropString(sourcenode, "protocol"))) {
scsisrc->protocol =
@@ -7746,7 +7713,6 @@ virDomainHostdevSubsysSCSIDefParseXML(xmlNodePtr sourcenode,
ret = virDomainHostdevSubsysSCSIHostDefParseXML(sourcenode, scsisrc);
cleanup:
- VIR_FREE(protocol);
return ret;
}
@@ -7754,10 +7720,10 @@ static int
virDomainHostdevSubsysSCSIVHostDefParseXML(xmlNodePtr sourcenode,
virDomainHostdevDefPtr def)
{
- char *protocol = NULL;
- char *wwpn = NULL;
virDomainHostdevSubsysSCSIVHostPtr hostsrc = &def->source.subsys.u.scsi_host;
int ret = -1;
+ VIR_AUTOFREE(char *) protocol = NULL;
+ VIR_AUTOFREE(char *) wwpn = NULL;
if (!(protocol = virXMLPropString(sourcenode, "protocol"))) {
virReportError(VIR_ERR_XML_ERROR, "%s",
@@ -7799,8 +7765,6 @@ virDomainHostdevSubsysSCSIVHostDefParseXML(xmlNodePtr sourcenode,
ret = 0;
cleanup:
- VIR_FREE(wwpn);
- VIR_FREE(protocol);
return ret;
}
@@ -7810,9 +7774,9 @@ virDomainHostdevSubsysMediatedDevDefParseXML(virDomainHostdevDefPtr
def,
{
int ret = -1;
unsigned char uuid[VIR_UUID_BUFLEN] = {0};
- char *uuidxml = NULL;
xmlNodePtr node = NULL;
virDomainHostdevSubsysMediatedDevPtr mdevsrc = &def->source.subsys.u.mdev;
+ VIR_AUTOFREE(char *) uuidxml = NULL;
if (!(node = virXPathNode("./source/address", ctxt))) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
@@ -7836,7 +7800,6 @@ virDomainHostdevSubsysMediatedDevDefParseXML(virDomainHostdevDefPtr
def,
virUUIDFormat(uuid, mdevsrc->uuidstr);
ret = 0;
cleanup:
- VIR_FREE(uuidxml);
return ret;
}
@@ -7848,17 +7811,17 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
unsigned int flags)
{
xmlNodePtr sourcenode;
- char *managed = NULL;
- char *sgio = NULL;
- char *rawio = NULL;
- char *backendStr = NULL;
- char *model = NULL;
- char *display = NULL;
int backend;
int ret = -1;
virDomainHostdevSubsysPCIPtr pcisrc = &def->source.subsys.u.pci;
virDomainHostdevSubsysSCSIPtr scsisrc = &def->source.subsys.u.scsi;
virDomainHostdevSubsysMediatedDevPtr mdevsrc = &def->source.subsys.u.mdev;
+ VIR_AUTOFREE(char *) managed = NULL;
+ VIR_AUTOFREE(char *) sgio = NULL;
+ VIR_AUTOFREE(char *) rawio = NULL;
+ VIR_AUTOFREE(char *) backendStr = NULL;
+ VIR_AUTOFREE(char *) model = NULL;
+ VIR_AUTOFREE(char *) display = NULL;
/* @managed can be read from the xml document - it is always an
* attribute of the toplevel element, no matter what type of
@@ -8018,12 +7981,6 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
ret = 0;
cleanup:
- VIR_FREE(managed);
- VIR_FREE(sgio);
- VIR_FREE(rawio);
- VIR_FREE(backendStr);
- VIR_FREE(model);
- VIR_FREE(display);
return ret;
}
@@ -8031,12 +7988,14 @@ static virNetDevIPAddrPtr
virDomainNetIPParseXML(xmlNodePtr node)
{
/* Parse the prefix in every case */
- virNetDevIPAddrPtr ip = NULL, ret = NULL;
- char *prefixStr = NULL;
+ virNetDevIPAddrPtr ret = NULL;
unsigned int prefixValue = 0;
- char *familyStr = NULL;
int family = AF_UNSPEC;
- char *address = NULL, *peer = NULL;
+ VIR_AUTOFREE(virNetDevIPAddrPtr) ip = NULL;
+ VIR_AUTOFREE(char *) prefixStr = NULL;
+ VIR_AUTOFREE(char *) familyStr = NULL;
+ VIR_AUTOFREE(char *) address = NULL;
+ VIR_AUTOFREE(char *) peer = NULL;
if (!(address = virXMLPropString(node, "address"))) {
virReportError(VIR_ERR_XML_ERROR, "%s",
@@ -8084,11 +8043,6 @@ virDomainNetIPParseXML(xmlNodePtr node)
VIR_STEAL_PTR(ret, ip);
cleanup:
- VIR_FREE(prefixStr);
- VIR_FREE(familyStr);
- VIR_FREE(address);
- VIR_FREE(peer);
- VIR_FREE(ip);
return ret;
}
@@ -8103,12 +8057,12 @@ virDomainNetIPInfoParseXML(const char *source,
xmlXPathContextPtr ctxt,
virNetDevIPInfoPtr def)
{
- xmlNodePtr *nodes = NULL;
- virNetDevIPAddrPtr ip = NULL;
virNetDevIPRoutePtr route = NULL;
int nnodes;
int ret = -1;
size_t i;
+ VIR_AUTOFREE(xmlNodePtr *) nodes = NULL;
+ VIR_AUTOFREE(virNetDevIPAddrPtr) ip = NULL;
if ((nnodes = virXPathNodeSet("./ip", ctxt, &nodes)) < 0)
goto cleanup;
@@ -8133,9 +8087,7 @@ virDomainNetIPInfoParseXML(const char *source,
cleanup:
if (ret < 0)
virNetDevIPInfoClear(def);
- VIR_FREE(ip);
virNetDevIPRouteFree(route);
- VIR_FREE(nodes);
return ret;
}
@@ -8146,8 +8098,8 @@ virDomainNetDefCoalesceParseXML(xmlNodePtr node,
{
virNetDevCoalescePtr ret = NULL;
xmlNodePtr save = NULL;
- char *str = NULL;
unsigned long long tmp = 0;
+ VIR_AUTOFREE(char *) str = NULL;
save = ctxt->node;
ctxt->node = node;
@@ -8163,10 +8115,8 @@ virDomainNetDefCoalesceParseXML(xmlNodePtr node,
virReportError(VIR_ERR_XML_DETAIL,
_("cannot parse value '%s' for coalesce
parameter"),
str);
- VIR_FREE(str);
goto error;
}
- VIR_FREE(str);
if (tmp > UINT32_MAX) {
virReportError(VIR_ERR_OVERFLOW,
@@ -8178,7 +8128,6 @@ virDomainNetDefCoalesceParseXML(xmlNodePtr node,
ret->rx_max_coalesced_frames = tmp;
cleanup:
- VIR_FREE(str);
ctxt->node = save;
return ret;
@@ -8553,8 +8502,9 @@ virSecurityLabelDefsParseXML(virDomainDefPtr def,
{
size_t i = 0, j;
int n;
- xmlNodePtr *list = NULL, saved_node;
+ xmlNodePtr saved_node;
virCapsHostPtr host = &caps->host;
+ VIR_AUTOFREE(xmlNodePtr *) list = NULL;
/* Check args and save context */
if (def == NULL || ctxt == NULL)
@@ -8592,7 +8542,6 @@ virSecurityLabelDefsParseXML(virDomainDefPtr def,
}
def->nseclabels = n;
ctxt->node = saved_node;
- VIR_FREE(list);
/* libvirt versions prior to 0.10.0 support just a single seclabel element
* in guest's XML and model attribute can be suppressed if type is none or
@@ -8647,7 +8596,6 @@ virSecurityLabelDefsParseXML(virDomainDefPtr def,
virSecurityLabelDefFree(def->seclabels[i - 1]);
VIR_FREE(def->seclabels);
def->nseclabels = 0;
- VIR_FREE(list);
return -1;
}
@@ -8662,8 +8610,8 @@ virSecurityDeviceLabelDefParseXML(virSecurityDeviceLabelDefPtr
**seclabels_rtn,
size_t nseclabels = 0;
int n;
size_t i, j;
- xmlNodePtr *list = NULL;
char *model, *relabel, *label, *labelskip;
+ VIR_AUTOFREE(xmlNodePtr *) list = NULL;
if ((n = virXPathNodeSet("./seclabel", ctxt, &list)) < 0)
goto error;
@@ -8731,7 +8679,6 @@ virSecurityDeviceLabelDefParseXML(virSecurityDeviceLabelDefPtr
**seclabels_rtn,
goto error;
}
}
- VIR_FREE(list);
*nseclabels_rtn = nseclabels;
*seclabels_rtn = seclabels;
@@ -8742,7 +8689,6 @@ virSecurityDeviceLabelDefParseXML(virSecurityDeviceLabelDefPtr
**seclabels_rtn,
for (i = 0; i < nseclabels; i++)
virSecurityDeviceLabelDefFree(seclabels[i]);
VIR_FREE(seclabels);
- VIR_FREE(list);
return -1;
}
@@ -8785,10 +8731,10 @@ virDomainLeaseDefParseXML(xmlNodePtr node)
{
virDomainLeaseDefPtr def;
xmlNodePtr cur;
- char *lockspace = NULL;
- char *key = NULL;
- char *path = NULL;
- char *offset = NULL;
+ VIR_AUTOFREE(char *) lockspace = NULL;
+ VIR_AUTOFREE(char *) key = NULL;
+ VIR_AUTOFREE(char *) path = NULL;
+ VIR_AUTOFREE(char *) offset = NULL;
if (VIR_ALLOC(def) < 0)
return NULL;
@@ -8833,11 +8779,6 @@ virDomainLeaseDefParseXML(xmlNodePtr node)
VIR_STEAL_PTR(def->path, path);
cleanup:
- VIR_FREE(lockspace);
- VIR_FREE(key);
- VIR_FREE(path);
- VIR_FREE(offset);
-
return def;
error:
@@ -8850,9 +8791,9 @@ static int
virDomainDiskSourcePoolDefParse(xmlNodePtr node,
virStorageSourcePoolDefPtr *srcpool)
{
- char *mode = NULL;
virStorageSourcePoolDefPtr source;
int ret = -1;
+ VIR_AUTOFREE(char *) mode = NULL;
*srcpool = NULL;
@@ -8889,7 +8830,6 @@ virDomainDiskSourcePoolDefParse(xmlNodePtr node,
cleanup:
virStorageSourcePoolDefFree(source);
- VIR_FREE(mode);
return ret;
}
@@ -8900,11 +8840,11 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node,
virStorageSourcePtr src,
unsigned int flags)
{
- char *protocol = NULL;
- char *haveTLS = NULL;
- char *tlsCfg = NULL;
int tlsCfgVal;
int ret = -1;
+ VIR_AUTOFREE(char *) protocol = NULL;
+ VIR_AUTOFREE(char *) haveTLS = NULL;
+ VIR_AUTOFREE(char *) tlsCfg = NULL;
if (!(protocol = virXMLPropString(node, "protocol"))) {
virReportError(VIR_ERR_XML_ERROR, "%s",
@@ -8981,9 +8921,6 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node,
ret = 0;
cleanup:
- VIR_FREE(tlsCfg);
- VIR_FREE(haveTLS);
- VIR_FREE(protocol);
return ret;
}
@@ -9138,11 +9075,11 @@ virDomainDiskBackingStoreParse(xmlXPathContextPtr ctxt,
{
xmlNodePtr save_ctxt = ctxt->node;
xmlNodePtr source;
- char *type = NULL;
- char *format = NULL;
- char *idx = NULL;
int ret = -1;
VIR_AUTOUNREF(virStorageSourcePtr) backingStore = NULL;
+ VIR_AUTOFREE(char *) type = NULL;
+ VIR_AUTOFREE(char *) format = NULL;
+ VIR_AUTOFREE(char *) idx = NULL;
if (!(ctxt->node = virXPathNode("./backingStore", ctxt))) {
ret = 0;
@@ -9203,9 +9140,6 @@ virDomainDiskBackingStoreParse(xmlXPathContextPtr ctxt,
ret = 0;
cleanup:
- VIR_FREE(type);
- VIR_FREE(format);
- VIR_FREE(idx);
ctxt->node = save_ctxt;
return ret;
}
@@ -9301,11 +9235,11 @@ virDomainDiskDefMirrorParse(virDomainDiskDefPtr def,
virDomainXMLOptionPtr xmlopt)
{
xmlNodePtr mirrorNode;
- char *mirrorFormat = NULL;
- char *mirrorType = NULL;
- char *ready = NULL;
- char *blockJob = NULL;
int ret = -1;
+ VIR_AUTOFREE(char *) mirrorFormat = NULL;
+ VIR_AUTOFREE(char *) mirrorType = NULL;
+ VIR_AUTOFREE(char *) ready = NULL;
+ VIR_AUTOFREE(char *) blockJob = NULL;
if (!(def->mirror = virStorageSourceNew()))
goto cleanup;
@@ -9378,10 +9312,6 @@ virDomainDiskDefMirrorParse(virDomainDiskDefPtr def,
ret = 0;
cleanup:
- VIR_FREE(ready);
- VIR_FREE(blockJob);
- VIR_FREE(mirrorType);
- VIR_FREE(mirrorFormat);
return ret;
}
@@ -9390,7 +9320,7 @@ static int
virDomainDiskDefGeometryParse(virDomainDiskDefPtr def,
xmlNodePtr cur)
{
- char *tmp;
+ VIR_AUTOFREE(char *) tmp = NULL;
if ((tmp = virXMLPropString(cur, "cyls"))) {
if (virStrToLong_ui(tmp, NULL, 10, &def->geometry.cylinders) < 0) {
@@ -9427,13 +9357,11 @@ virDomainDiskDefGeometryParse(virDomainDiskDefPtr def,
tmp);
goto error;
}
- VIR_FREE(tmp);
}
return 0;
error:
- VIR_FREE(tmp);
return -1;
}
@@ -9578,8 +9506,8 @@ static int
virDomainDiskDefDriverParseXML(virDomainDiskDefPtr def,
xmlNodePtr cur)
{
- char *tmp = NULL;
int ret = -1;
+ VIR_AUTOFREE(char *) tmp = NULL;
def->driverName = virXMLPropString(cur, "name");
@@ -9688,13 +9616,10 @@ virDomainDiskDefDriverParseXML(virDomainDiskDefPtr def,
tmp);
goto cleanup;
}
- VIR_FREE(tmp);
ret = 0;
cleanup:
- VIR_FREE(tmp);
-
return ret;
}
@@ -9743,26 +9668,26 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
virDomainDiskDefPtr def;
xmlNodePtr cur;
xmlNodePtr save_ctxt = ctxt->node;
- char *tmp = NULL;
- char *snapshot = NULL;
- char *rawio = NULL;
- char *sgio = NULL;
bool source = false;
- char *target = NULL;
- char *bus = NULL;
- char *devaddr = NULL;
virStorageEncryptionPtr encryption = NULL;
- char *serial = NULL;
- char *startupPolicy = NULL;
- char *tray = NULL;
- char *removable = NULL;
- char *logical_block_size = NULL;
- char *physical_block_size = NULL;
- char *wwn = NULL;
- char *vendor = NULL;
- char *product = NULL;
- char *domain_name = NULL;
VIR_AUTOPTR(virStorageAuthDef) authdef = NULL;
+ VIR_AUTOFREE(char *) tmp = NULL;
+ VIR_AUTOFREE(char *) snapshot = NULL;
+ VIR_AUTOFREE(char *) rawio = NULL;
+ VIR_AUTOFREE(char *) sgio = NULL;
+ VIR_AUTOFREE(char *) target = NULL;
+ VIR_AUTOFREE(char *) bus = NULL;
+ VIR_AUTOFREE(char *) devaddr = NULL;
+ VIR_AUTOFREE(char *) serial = NULL;
+ VIR_AUTOFREE(char *) startupPolicy = NULL;
+ VIR_AUTOFREE(char *) tray = NULL;
+ VIR_AUTOFREE(char *) removable = NULL;
+ VIR_AUTOFREE(char *) logical_block_size = NULL;
+ VIR_AUTOFREE(char *) physical_block_size = NULL;
+ VIR_AUTOFREE(char *) wwn = NULL;
+ VIR_AUTOFREE(char *) vendor = NULL;
+ VIR_AUTOFREE(char *) product = NULL;
+ VIR_AUTOFREE(char *) domain_name = NULL;
if (!(def = virDomainDiskDefNew(xmlopt)))
return NULL;
@@ -10150,25 +10075,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
goto error;
cleanup:
- VIR_FREE(tmp);
- VIR_FREE(bus);
- VIR_FREE(snapshot);
- VIR_FREE(rawio);
- VIR_FREE(sgio);
- VIR_FREE(target);
- VIR_FREE(tray);
- VIR_FREE(removable);
- VIR_FREE(devaddr);
- VIR_FREE(serial);
virStorageEncryptionFree(encryption);
- VIR_FREE(startupPolicy);
- VIR_FREE(logical_block_size);
- VIR_FREE(physical_block_size);
- VIR_FREE(wwn);
- VIR_FREE(vendor);
- VIR_FREE(product);
- VIR_FREE(domain_name);
-
ctxt->node = save_ctxt;
return def;
@@ -10209,11 +10116,11 @@ virDomainParseScaledValue(const char *xpath,
unsigned long long max,
bool required)
{
- char *xpath_full = NULL;
- char *unit = NULL;
- char *bytes_str = NULL;
int ret = -1;
unsigned long long bytes;
+ VIR_AUTOFREE(char *) xpath_full = NULL;
+ VIR_AUTOFREE(char *) unit = NULL;
+ VIR_AUTOFREE(char *) bytes_str = NULL;
*val = 0;
if (virAsprintf(&xpath_full, "string(%s)", xpath) < 0)
@@ -10252,9 +10159,6 @@ virDomainParseScaledValue(const char *xpath,
*val = bytes;
ret = 1;
cleanup:
- VIR_FREE(bytes_str);
- VIR_FREE(xpath_full);
- VIR_FREE(unit);
return ret;
}
@@ -10455,27 +10359,27 @@ virDomainControllerDefParseXML(virDomainXMLOptionPtr xmlopt,
virDomainControllerDefPtr def = NULL;
int type = 0;
xmlNodePtr cur = NULL;
- char *typeStr = NULL;
- char *idx = NULL;
- char *model = NULL;
- char *queues = NULL;
- char *cmd_per_lun = NULL;
- char *max_sectors = NULL;
bool processedModel = false;
- char *modelName = NULL;
bool processedTarget = false;
- char *chassisNr = NULL;
- char *chassis = NULL;
- char *port = NULL;
- char *busNr = NULL;
- char *targetIndex = NULL;
int numaNode = -1;
- char *ioeventfd = NULL;
- char *portsStr = NULL;
int ports = -1;
- char *iothread = NULL;
xmlNodePtr saved = ctxt->node;
int rc;
+ VIR_AUTOFREE(char *) typeStr = NULL;
+ VIR_AUTOFREE(char *) idx = NULL;
+ VIR_AUTOFREE(char *) model = NULL;
+ VIR_AUTOFREE(char *) queues = NULL;
+ VIR_AUTOFREE(char *) cmd_per_lun = NULL;
+ VIR_AUTOFREE(char *) max_sectors = NULL;
+ VIR_AUTOFREE(char *) modelName = NULL;
+ VIR_AUTOFREE(char *) chassisNr = NULL;
+ VIR_AUTOFREE(char *) chassis = NULL;
+ VIR_AUTOFREE(char *) port = NULL;
+ VIR_AUTOFREE(char *) busNr = NULL;
+ VIR_AUTOFREE(char *) targetIndex = NULL;
+ VIR_AUTOFREE(char *) ioeventfd = NULL;
+ VIR_AUTOFREE(char *) portsStr = NULL;
+ VIR_AUTOFREE(char *) iothread = NULL;
ctxt->node = node;
@@ -10614,20 +10518,18 @@ virDomainControllerDefParseXML(virDomainXMLOptionPtr xmlopt,
switch (def->type) {
case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL: {
- def->opts.vioserial.ports = ports;
+ VIR_AUTOFREE(char *) vectors = virXMLPropString(node, "vectors");
- char *vectors = virXMLPropString(node, "vectors");
+ def->opts.vioserial.ports = ports;
if (vectors) {
int r = virStrToLong_i(vectors, NULL, 10,
&def->opts.vioserial.vectors);
if (r != 0 || def->opts.vioserial.vectors < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Invalid vectors: %s"), vectors);
- VIR_FREE(vectors);
goto error;
}
}
- VIR_FREE(vectors);
break;
}
case VIR_DOMAIN_CONTROLLER_TYPE_USB: {
@@ -10790,22 +10692,6 @@ virDomainControllerDefParseXML(virDomainXMLOptionPtr xmlopt,
cleanup:
ctxt->node = saved;
- VIR_FREE(typeStr);
- VIR_FREE(idx);
- VIR_FREE(model);
- VIR_FREE(queues);
- VIR_FREE(cmd_per_lun);
- VIR_FREE(max_sectors);
- VIR_FREE(modelName);
- VIR_FREE(chassisNr);
- VIR_FREE(chassis);
- VIR_FREE(port);
- VIR_FREE(busNr);
- VIR_FREE(targetIndex);
- VIR_FREE(ioeventfd);
- VIR_FREE(portsStr);
- VIR_FREE(iothread);
-
return def;
error:
@@ -10834,15 +10720,15 @@ virDomainFSDefParseXML(virDomainXMLOptionPtr xmlopt,
{
virDomainFSDefPtr def;
xmlNodePtr cur, save_node = ctxt->node;
- char *type = NULL;
- char *fsdriver = NULL;
- char *source = NULL;
- char *target = NULL;
- char *format = NULL;
- char *accessmode = NULL;
- char *wrpolicy = NULL;
- char *usage = NULL;
- char *units = NULL;
+ VIR_AUTOFREE(char *) type = NULL;
+ VIR_AUTOFREE(char *) fsdriver = NULL;
+ VIR_AUTOFREE(char *) source = NULL;
+ VIR_AUTOFREE(char *) target = NULL;
+ VIR_AUTOFREE(char *) format = NULL;
+ VIR_AUTOFREE(char *) accessmode = NULL;
+ VIR_AUTOFREE(char *) wrpolicy = NULL;
+ VIR_AUTOFREE(char *) usage = NULL;
+ VIR_AUTOFREE(char *) units = NULL;
ctxt->node = node;
@@ -10988,16 +10874,6 @@ virDomainFSDefParseXML(virDomainXMLOptionPtr xmlopt,
cleanup:
ctxt->node = save_node;
- VIR_FREE(type);
- VIR_FREE(fsdriver);
- VIR_FREE(target);
- VIR_FREE(source);
- VIR_FREE(accessmode);
- VIR_FREE(wrpolicy);
- VIR_FREE(usage);
- VIR_FREE(units);
- VIR_FREE(format);
-
return def;
error:
@@ -11019,11 +10895,11 @@ virDomainActualNetDefParseXML(xmlNodePtr node,
xmlNodePtr bandwidth_node = NULL;
xmlNodePtr vlanNode;
xmlNodePtr virtPortNode;
- char *type = NULL;
- char *mode = NULL;
- char *addrtype = NULL;
- char *trustGuestRxFilters = NULL;
- char *macTableManager = NULL;
+ VIR_AUTOFREE(char *) type = NULL;
+ VIR_AUTOFREE(char *) mode = NULL;
+ VIR_AUTOFREE(char *) addrtype = NULL;
+ VIR_AUTOFREE(char *) trustGuestRxFilters = NULL;
+ VIR_AUTOFREE(char *) macTableManager = NULL;
if (VIR_ALLOC(actual) < 0)
return -1;
@@ -11122,16 +10998,16 @@ virDomainActualNetDefParseXML(xmlNodePtr node,
goto error;
}
} else if (actual->type == VIR_DOMAIN_NET_TYPE_NETWORK) {
- char *class_id = virXPathString("string(./class/@id)", ctxt);
+ VIR_AUTOFREE(char *) class_id = NULL;
+
+ class_id = virXPathString("string(./class/@id)", ctxt);
if (class_id &&
virStrToLong_ui(class_id, NULL, 10, &actual->class_id) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Unable to parse class id '%s'"),
class_id);
- VIR_FREE(class_id);
goto error;
}
- VIR_FREE(class_id);
}
if (actual->type == VIR_DOMAIN_NET_TYPE_BRIDGE ||
actual->type == VIR_DOMAIN_NET_TYPE_NETWORK) {
@@ -11173,11 +11049,6 @@ virDomainActualNetDefParseXML(xmlNodePtr node,
VIR_STEAL_PTR(*def, actual);
ret = 0;
error:
- VIR_FREE(type);
- VIR_FREE(mode);
- VIR_FREE(addrtype);
- VIR_FREE(trustGuestRxFilters);
- VIR_FREE(macTableManager);
virDomainActualNetDefFree(actual);
ctxt->node = save_ctxt;
@@ -11220,9 +11091,9 @@
virDomainChrSourceReconnectDefParseXML(virDomainChrSourceReconnectDefPtr def,
{
int ret = -1;
int tmpVal;
- char *tmp = NULL;
xmlNodePtr saveNode = ctxt->node;
xmlNodePtr cur;
+ VIR_AUTOFREE(char *) tmp = NULL;
ctxt->node = node;
@@ -11246,7 +11117,6 @@
virDomainChrSourceReconnectDefParseXML(virDomainChrSourceReconnectDefPtr def,
tmp);
goto cleanup;
}
- VIR_FREE(tmp);
} else {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("missing timeout for chardev with "
@@ -11259,7 +11129,6 @@
virDomainChrSourceReconnectDefParseXML(virDomainChrSourceReconnectDefPtr def,
ret = 0;
cleanup:
ctxt->node = saveNode;
- VIR_FREE(tmp);
return ret;
}
@@ -11279,46 +11148,46 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt,
virDomainHostdevDefPtr hostdev;
xmlNodePtr cur;
xmlNodePtr tmpNode;
- char *macaddr = NULL;
- char *type = NULL;
- char *network = NULL;
- char *portgroup = NULL;
- char *bridge = NULL;
- char *dev = NULL;
- char *ifname = NULL;
- char *ifname_guest = NULL;
- char *ifname_guest_actual = NULL;
- char *script = NULL;
- char *address = NULL;
- char *port = NULL;
- char *localaddr = NULL;
- char *localport = NULL;
- char *model = NULL;
- char *backend = NULL;
- char *txmode = NULL;
- char *ioeventfd = NULL;
- char *event_idx = NULL;
- char *queues = NULL;
- char *rx_queue_size = NULL;
- char *tx_queue_size = NULL;
- char *str = NULL;
- char *filter = NULL;
- char *internal = NULL;
- char *devaddr = NULL;
- char *mode = NULL;
- char *linkstate = NULL;
- char *addrtype = NULL;
- char *domain_name = NULL;
- char *vhostuser_mode = NULL;
- char *vhostuser_path = NULL;
- char *vhostuser_type = NULL;
- char *trustGuestRxFilters = NULL;
- char *vhost_path = NULL;
virHashTablePtr filterparams = NULL;
virDomainActualNetDefPtr actual = NULL;
xmlNodePtr oldnode = ctxt->node;
virDomainChrSourceReconnectDef reconnect = {0};
int rv, val;
+ VIR_AUTOFREE(char *) macaddr = NULL;
+ VIR_AUTOFREE(char *) type = NULL;
+ VIR_AUTOFREE(char *) network = NULL;
+ VIR_AUTOFREE(char *) portgroup = NULL;
+ VIR_AUTOFREE(char *) bridge = NULL;
+ VIR_AUTOFREE(char *) dev = NULL;
+ VIR_AUTOFREE(char *) ifname = NULL;
+ VIR_AUTOFREE(char *) ifname_guest = NULL;
+ VIR_AUTOFREE(char *) ifname_guest_actual = NULL;
+ VIR_AUTOFREE(char *) script = NULL;
+ VIR_AUTOFREE(char *) address = NULL;
+ VIR_AUTOFREE(char *) port = NULL;
+ VIR_AUTOFREE(char *) localaddr = NULL;
+ VIR_AUTOFREE(char *) localport = NULL;
+ VIR_AUTOFREE(char *) model = NULL;
+ VIR_AUTOFREE(char *) backend = NULL;
+ VIR_AUTOFREE(char *) txmode = NULL;
+ VIR_AUTOFREE(char *) ioeventfd = NULL;
+ VIR_AUTOFREE(char *) event_idx = NULL;
+ VIR_AUTOFREE(char *) queues = NULL;
+ VIR_AUTOFREE(char *) rx_queue_size = NULL;
+ VIR_AUTOFREE(char *) tx_queue_size = NULL;
+ VIR_AUTOFREE(char *) str = NULL;
+ VIR_AUTOFREE(char *) filter = NULL;
+ VIR_AUTOFREE(char *) internal = NULL;
+ VIR_AUTOFREE(char *) devaddr = NULL;
+ VIR_AUTOFREE(char *) mode = NULL;
+ VIR_AUTOFREE(char *) linkstate = NULL;
+ VIR_AUTOFREE(char *) addrtype = NULL;
+ VIR_AUTOFREE(char *) domain_name = NULL;
+ VIR_AUTOFREE(char *) vhostuser_mode = NULL;
+ VIR_AUTOFREE(char *) vhostuser_path = NULL;
+ VIR_AUTOFREE(char *) vhostuser_type = NULL;
+ VIR_AUTOFREE(char *) trustGuestRxFilters = NULL;
+ VIR_AUTOFREE(char *) vhost_path = NULL;
if (VIR_ALLOC(def) < 0)
return NULL;
@@ -12066,44 +11935,8 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt,
cleanup:
ctxt->node = oldnode;
- VIR_FREE(macaddr);
- VIR_FREE(network);
- VIR_FREE(portgroup);
- VIR_FREE(address);
- VIR_FREE(port);
- VIR_FREE(vhostuser_type);
- VIR_FREE(vhostuser_path);
- VIR_FREE(vhostuser_mode);
- VIR_FREE(ifname);
- VIR_FREE(ifname_guest);
- VIR_FREE(ifname_guest_actual);
- VIR_FREE(dev);
virDomainActualNetDefFree(actual);
- VIR_FREE(script);
- VIR_FREE(bridge);
- VIR_FREE(model);
- VIR_FREE(backend);
- VIR_FREE(txmode);
- VIR_FREE(ioeventfd);
- VIR_FREE(event_idx);
- VIR_FREE(queues);
- VIR_FREE(rx_queue_size);
- VIR_FREE(tx_queue_size);
- VIR_FREE(str);
- VIR_FREE(filter);
- VIR_FREE(type);
- VIR_FREE(internal);
- VIR_FREE(devaddr);
- VIR_FREE(mode);
- VIR_FREE(linkstate);
- VIR_FREE(addrtype);
- VIR_FREE(domain_name);
- VIR_FREE(trustGuestRxFilters);
- VIR_FREE(vhost_path);
- VIR_FREE(localaddr);
- VIR_FREE(localport);
virHashFree(filterparams);
-
return def;
error:
@@ -12203,11 +12036,11 @@ virDomainChrDefParseTargetXML(virDomainChrDefPtr def,
int ret = -1;
xmlNodePtr child;
unsigned int port;
- char *targetType = virXMLPropString(cur, "type");
- char *targetModel = NULL;
- char *addrStr = NULL;
- char *portStr = NULL;
- char *stateStr = NULL;
+ VIR_AUTOFREE(char *) targetType = virXMLPropString(cur, "type");
+ VIR_AUTOFREE(char *) targetModel = NULL;
+ VIR_AUTOFREE(char *) addrStr = NULL;
+ VIR_AUTOFREE(char *) portStr = NULL;
+ VIR_AUTOFREE(char *) stateStr = NULL;
if ((def->targetType =
virDomainChrTargetTypeFromString(def->deviceType,
@@ -12323,12 +12156,6 @@ virDomainChrDefParseTargetXML(virDomainChrDefPtr def,
ret = 0;
error:
- VIR_FREE(targetType);
- VIR_FREE(targetModel);
- VIR_FREE(addrStr);
- VIR_FREE(portStr);
- VIR_FREE(stateStr);
-
return ret;
}
@@ -12348,8 +12175,8 @@ typedef enum {
static int
virDomainChrSourceDefParseMode(xmlNodePtr source)
{
- char *mode = virXMLPropString(source, "mode");
int ret = -1;
+ VIR_AUTOFREE(char *) mode = virXMLPropString(source, "mode");
if (!mode || STREQ(mode, "connect")) {
ret = VIR_DOMAIN_CHR_SOURCE_MODE_CONNECT;
@@ -12360,7 +12187,6 @@ virDomainChrSourceDefParseMode(xmlNodePtr source)
_("Unknown source mode '%s'"), mode);
}
- VIR_FREE(mode);
return ret;
}
@@ -12372,8 +12198,8 @@ virDomainChrSourceDefParseTCP(virDomainChrSourceDefPtr def,
unsigned int flags)
{
int mode;
- char *tmp = NULL;
int tmpVal;
+ VIR_AUTOFREE(char *) tmp = NULL;
if ((mode = virDomainChrSourceDefParseMode(source)) < 0)
goto error;
@@ -12401,7 +12227,6 @@ virDomainChrSourceDefParseTCP(virDomainChrSourceDefPtr def,
goto error;
}
def->data.tcp.tlsFromConfig = !!tmpVal;
- VIR_FREE(tmp);
}
if (virDomainChrSourceReconnectDefParseXML(&def->data.tcp.reconnect,
@@ -12413,7 +12238,6 @@ virDomainChrSourceDefParseTCP(virDomainChrSourceDefPtr def,
return 0;
error:
- VIR_FREE(tmp);
return -1;
}
@@ -12468,7 +12292,7 @@ static int
virDomainChrSourceDefParseFile(virDomainChrSourceDefPtr def,
xmlNodePtr source)
{
- char *append = NULL;
+ VIR_AUTOFREE(char *) append = NULL;
def->data.file.path = virXMLPropString(source, "path");
@@ -12477,11 +12301,9 @@ virDomainChrSourceDefParseFile(virDomainChrSourceDefPtr def,
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Invalid append attribute value '%s'"),
append);
- VIR_FREE(append);
return -1;
}
- VIR_FREE(append);
return 0;
}
@@ -12490,7 +12312,7 @@ static int
virDomainChrSourceDefParseProtocol(virDomainChrSourceDefPtr def,
xmlNodePtr protocol)
{
- char *prot = NULL;
+ VIR_AUTOFREE(char *) prot = NULL;
if (def->type != VIR_DOMAIN_CHR_TYPE_TCP)
return 0;
@@ -12500,11 +12322,9 @@ virDomainChrSourceDefParseProtocol(virDomainChrSourceDefPtr def,
virDomainChrTcpProtocolTypeFromString(prot)) < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Unknown protocol '%s'"), prot);
- VIR_FREE(prot);
return -1;
}
- VIR_FREE(prot);
return 0;
}
@@ -12513,7 +12333,7 @@ static int
virDomainChrSourceDefParseLog(virDomainChrSourceDefPtr def,
xmlNodePtr log)
{
- char *append = NULL;
+ VIR_AUTOFREE(char *) append = NULL;
def->logfile = virXMLPropString(log, "file");
@@ -12522,11 +12342,9 @@ virDomainChrSourceDefParseLog(virDomainChrSourceDefPtr def,
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Invalid append attribute value '%s'"),
append);
- VIR_FREE(append);
return -1;
}
- VIR_FREE(append);
return 0;
}
@@ -12774,10 +12592,10 @@ virDomainChrDefParseXML(virDomainXMLOptionPtr xmlopt,
unsigned int flags)
{
xmlNodePtr cur;
- char *type = NULL;
const char *nodeName;
virDomainChrDefPtr def;
bool seenTarget = false;
+ VIR_AUTOFREE(char *) type = NULL;
if (!(def = virDomainChrDefNew(xmlopt)))
return NULL;
@@ -12844,8 +12662,6 @@ virDomainChrDefParseXML(virDomainXMLOptionPtr xmlopt,
}
cleanup:
- VIR_FREE(type);
-
return def;
error:
@@ -12861,10 +12677,10 @@ virDomainSmartcardDefParseXML(virDomainXMLOptionPtr xmlopt,
unsigned int flags)
{
xmlNodePtr cur;
- char *mode = NULL;
- char *type = NULL;
virDomainSmartcardDefPtr def;
size_t i;
+ VIR_AUTOFREE(char *) mode = NULL;
+ VIR_AUTOFREE(char *) type = NULL;
if (VIR_ALLOC(def) < 0)
return NULL;
@@ -12976,9 +12792,6 @@ virDomainSmartcardDefParseXML(virDomainXMLOptionPtr xmlopt,
}
cleanup:
- VIR_FREE(mode);
- VIR_FREE(type);
-
return def;
error:
@@ -13009,14 +12822,14 @@ virDomainTPMDefParseXML(virDomainXMLOptionPtr xmlopt,
xmlXPathContextPtr ctxt,
unsigned int flags)
{
- char *path = NULL;
- char *model = NULL;
- char *backend = NULL;
- char *version = NULL;
virDomainTPMDefPtr def;
xmlNodePtr save = ctxt->node;
- xmlNodePtr *backends = NULL;
int nbackends;
+ VIR_AUTOFREE(char *) path = NULL;
+ VIR_AUTOFREE(char *) model = NULL;
+ VIR_AUTOFREE(char *) backend = NULL;
+ VIR_AUTOFREE(char *) version = NULL;
+ VIR_AUTOFREE(xmlNodePtr *) backends = NULL;
if (VIR_ALLOC(def) < 0)
return NULL;
@@ -13089,11 +12902,6 @@ virDomainTPMDefParseXML(virDomainXMLOptionPtr xmlopt,
goto error;
cleanup:
- VIR_FREE(path);
- VIR_FREE(model);
- VIR_FREE(backend);
- VIR_FREE(backends);
- VIR_FREE(version);
ctxt->node = save;
return def;
@@ -13109,7 +12917,7 @@ virDomainPanicDefParseXML(virDomainXMLOptionPtr xmlopt,
unsigned int flags)
{
virDomainPanicDefPtr panic;
- char *model = NULL;
+ VIR_AUTOFREE(char *) model = NULL;
if (VIR_ALLOC(panic) < 0)
return NULL;
@@ -13127,7 +12935,6 @@ virDomainPanicDefParseXML(virDomainXMLOptionPtr xmlopt,
}
cleanup:
- VIR_FREE(model);
return panic;
error:
@@ -13146,9 +12953,9 @@ virDomainInputDefParseXML(virDomainXMLOptionPtr xmlopt,
{
xmlNodePtr save = ctxt->node;
virDomainInputDefPtr def;
- char *evdev = NULL;
- char *type = NULL;
- char *bus = NULL;
+ VIR_AUTOFREE(char *) evdev = NULL;
+ VIR_AUTOFREE(char *) type = NULL;
+ VIR_AUTOFREE(char *) bus = NULL;
if (VIR_ALLOC(def) < 0)
return NULL;
@@ -13276,10 +13083,6 @@ virDomainInputDefParseXML(virDomainXMLOptionPtr xmlopt,
goto error;
cleanup:
- VIR_FREE(evdev);
- VIR_FREE(type);
- VIR_FREE(bus);
-
ctxt->node = save;
return def;
@@ -13297,7 +13100,7 @@ virDomainHubDefParseXML(virDomainXMLOptionPtr xmlopt,
unsigned int flags)
{
virDomainHubDefPtr def;
- char *type = NULL;
+ VIR_AUTOFREE(char *) type = NULL;
if (VIR_ALLOC(def) < 0)
return NULL;
@@ -13320,8 +13123,6 @@ virDomainHubDefParseXML(virDomainXMLOptionPtr xmlopt,
goto error;
cleanup:
- VIR_FREE(type);
-
return def;
error:
@@ -13336,16 +13137,15 @@ static virDomainTimerDefPtr
virDomainTimerDefParseXML(xmlNodePtr node,
xmlXPathContextPtr ctxt)
{
- char *name = NULL;
- char *present = NULL;
- char *tickpolicy = NULL;
- char *track = NULL;
- char *mode = NULL;
-
virDomainTimerDefPtr def;
xmlNodePtr oldnode = ctxt->node;
xmlNodePtr catchup;
int ret;
+ VIR_AUTOFREE(char *) name = NULL;
+ VIR_AUTOFREE(char *) present = NULL;
+ VIR_AUTOFREE(char *) tickpolicy = NULL;
+ VIR_AUTOFREE(char *) track = NULL;
+ VIR_AUTOFREE(char *) mode = NULL;
if (VIR_ALLOC(def) < 0)
return NULL;
@@ -13448,11 +13248,6 @@ virDomainTimerDefParseXML(xmlNodePtr node,
}
cleanup:
- VIR_FREE(name);
- VIR_FREE(present);
- VIR_FREE(tickpolicy);
- VIR_FREE(track);
- VIR_FREE(mode);
ctxt->node = oldnode;
return def;
@@ -13468,8 +13263,8 @@ virDomainGraphicsAuthDefParseXML(xmlNodePtr node,
virDomainGraphicsAuthDefPtr def,
int type)
{
- char *validTo = NULL;
- char *connected = virXMLPropString(node, "connected");
+ VIR_AUTOFREE(char *) validTo = NULL;
+ VIR_AUTOFREE(char *) connected = virXMLPropString(node, "connected");
def->passwd = virXMLPropString(node, "passwd");
@@ -13497,11 +13292,9 @@ virDomainGraphicsAuthDefParseXML(xmlNodePtr node,
virReportError(VIR_ERR_INTERNAL_ERROR,
_("cannot parse password validity time '%s',
expect YYYY-MM-DDTHH:MM:SS"),
validTo);
- VIR_FREE(validTo);
VIR_FREE(def->passwd);
return -1;
}
- VIR_FREE(validTo);
tm.tm_year -= 1900; /* Human epoch starts at 0 BC, not 1900BC */
tm.tm_mon--; /* Humans start months at 1, computers at 0 */
@@ -13516,10 +13309,8 @@ virDomainGraphicsAuthDefParseXML(xmlNodePtr node,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown connected value %s"),
connected);
- VIR_FREE(connected);
return -1;
}
- VIR_FREE(connected);
/* VNC supports connected='keep' only */
if (type == VIR_DOMAIN_GRAPHICS_TYPE_VNC &&
@@ -13557,16 +13348,16 @@ virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDefPtr
def,
unsigned int flags)
{
int ret = -1;
- char *type = virXMLPropString(node, "type");
- char *address = virXMLPropString(node, "address");
- char *network = virXMLPropString(node, "network");
- char *socketPath = virXMLPropString(node, "socket");
- char *fromConfig = virXMLPropString(node, "fromConfig");
- char *autoGenerated = virXMLPropString(node, "autoGenerated");
- char *addressCompat = NULL;
- char *socketCompat = NULL;
const char *graphicsType = virDomainGraphicsTypeToString(graphics->type);
int tmp, typeVal;
+ VIR_AUTOFREE(char *) type = virXMLPropString(node, "type");
+ VIR_AUTOFREE(char *) address = virXMLPropString(node, "address");
+ VIR_AUTOFREE(char *) network = virXMLPropString(node, "network");
+ VIR_AUTOFREE(char *) socketPath = virXMLPropString(node, "socket");
+ VIR_AUTOFREE(char *) fromConfig = virXMLPropString(node, "fromConfig");
+ VIR_AUTOFREE(char *) autoGenerated = virXMLPropString(node,
"autoGenerated");
+ VIR_AUTOFREE(char *) addressCompat = NULL;
+ VIR_AUTOFREE(char *) socketCompat = NULL;
if (parent) {
addressCompat = virXMLPropString(parent, "listen");
@@ -13691,14 +13482,6 @@ virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDefPtr
def,
error:
if (ret < 0)
virDomainGraphicsListenDefClear(def);
- VIR_FREE(type);
- VIR_FREE(address);
- VIR_FREE(network);
- VIR_FREE(socketPath);
- VIR_FREE(fromConfig);
- VIR_FREE(autoGenerated);
- VIR_FREE(addressCompat);
- VIR_FREE(socketCompat);
return ret;
}
@@ -13709,12 +13492,12 @@ virDomainGraphicsListensParseXML(virDomainGraphicsDefPtr def,
xmlXPathContextPtr ctxt,
unsigned int flags)
{
- xmlNodePtr *listenNodes = NULL;
xmlNodePtr save = ctxt->node;
virDomainGraphicsListenDef newListen = {0};
- char *socketPath = NULL;
int nListens;
int ret = -1;
+ VIR_AUTOFREE(xmlNodePtr *) listenNodes = NULL;
+ VIR_AUTOFREE(char *) socketPath = NULL;
ctxt->node = node;
@@ -13738,7 +13521,6 @@ virDomainGraphicsListensParseXML(virDomainGraphicsDefPtr def,
def->nListens++;
}
- VIR_FREE(listenNodes);
}
/* If no <listen/> element was found in XML for backward compatibility
@@ -13781,8 +13563,6 @@ virDomainGraphicsListensParseXML(virDomainGraphicsDefPtr def,
ret = 0;
cleanup:
virDomainGraphicsListenDefClear(&newListen);
- VIR_FREE(listenNodes);
- VIR_FREE(socketPath);
ctxt->node = save;
return ret;
}
@@ -13794,12 +13574,12 @@ virDomainGraphicsDefParseXMLVNC(virDomainGraphicsDefPtr def,
xmlXPathContextPtr ctxt,
unsigned int flags)
{
- char *port = virXMLPropString(node, "port");
- char *websocket = virXMLPropString(node, "websocket");
- char *websocketGenerated = virXMLPropString(node, "websocketGenerated");
- char *sharePolicy = virXMLPropString(node, "sharePolicy");
- char *autoport = virXMLPropString(node, "autoport");
int ret = -1;
+ VIR_AUTOFREE(char *) port = virXMLPropString(node, "port");
+ VIR_AUTOFREE(char *) websocket = virXMLPropString(node, "websocket");
+ VIR_AUTOFREE(char *) websocketGenerated = virXMLPropString(node,
"websocketGenerated");
+ VIR_AUTOFREE(char *) sharePolicy = virXMLPropString(node, "sharePolicy");
+ VIR_AUTOFREE(char *) autoport = virXMLPropString(node, "autoport");
if (virDomainGraphicsListensParseXML(def, node, ctxt, flags) < 0)
goto cleanup;
@@ -13866,11 +13646,6 @@ virDomainGraphicsDefParseXMLVNC(virDomainGraphicsDefPtr def,
ret = 0;
cleanup:
- VIR_FREE(port);
- VIR_FREE(autoport);
- VIR_FREE(websocket);
- VIR_FREE(websocketGenerated);
- VIR_FREE(sharePolicy);
return ret;
}
@@ -13881,11 +13656,11 @@ virDomainGraphicsDefParseXMLSDL(virDomainGraphicsDefPtr def,
xmlXPathContextPtr ctxt)
{
xmlNodePtr save = ctxt->node;
- char *enable = NULL;
int enableVal;
xmlNodePtr glNode;
- char *fullscreen = virXMLPropString(node, "fullscreen");
int ret = -1;
+ VIR_AUTOFREE(char *) fullscreen = virXMLPropString(node, "fullscreen");
+ VIR_AUTOFREE(char *) enable = NULL;
ctxt->node = node;
@@ -13926,8 +13701,6 @@ virDomainGraphicsDefParseXMLSDL(virDomainGraphicsDefPtr def,
ret = 0;
cleanup:
- VIR_FREE(fullscreen);
- VIR_FREE(enable);
ctxt->node = save;
return ret;
}
@@ -13939,11 +13712,11 @@ virDomainGraphicsDefParseXMLRDP(virDomainGraphicsDefPtr def,
xmlXPathContextPtr ctxt,
unsigned int flags)
{
- char *port = virXMLPropString(node, "port");
- char *autoport = virXMLPropString(node, "autoport");
- char *replaceUser = virXMLPropString(node, "replaceUser");
- char *multiUser = virXMLPropString(node, "multiUser");
int ret = -1;
+ VIR_AUTOFREE(char *) port = virXMLPropString(node, "port");
+ VIR_AUTOFREE(char *) autoport = virXMLPropString(node, "autoport");
+ VIR_AUTOFREE(char *) replaceUser = virXMLPropString(node, "replaceUser");
+ VIR_AUTOFREE(char *) multiUser = virXMLPropString(node, "multiUser");
if (virDomainGraphicsListensParseXML(def, node, ctxt, flags) < 0)
goto error;
@@ -13977,10 +13750,6 @@ virDomainGraphicsDefParseXMLRDP(virDomainGraphicsDefPtr def,
ret = 0;
error:
- VIR_FREE(port);
- VIR_FREE(autoport);
- VIR_FREE(replaceUser);
- VIR_FREE(multiUser);
return ret;
}
@@ -13989,8 +13758,8 @@ static int
virDomainGraphicsDefParseXMLDesktop(virDomainGraphicsDefPtr def,
xmlNodePtr node)
{
- char *fullscreen = virXMLPropString(node, "fullscreen");
int ret = -1;
+ VIR_AUTOFREE(char *) fullscreen = virXMLPropString(node, "fullscreen");
if (fullscreen != NULL) {
if (STREQ(fullscreen, "yes")) {
@@ -14010,7 +13779,6 @@ virDomainGraphicsDefParseXMLDesktop(virDomainGraphicsDefPtr def,
ret = 0;
cleanup:
- VIR_FREE(fullscreen);
return ret;
}
@@ -14022,12 +13790,12 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
unsigned int flags)
{
xmlNodePtr cur;
- char *port = virXMLPropString(node, "port");
- char *tlsPort = virXMLPropString(node, "tlsPort");
- char *autoport = virXMLPropString(node, "autoport");
- char *defaultMode = virXMLPropString(node, "defaultMode");
int defaultModeVal;
int ret = -1;
+ VIR_AUTOFREE(char *) port = virXMLPropString(node, "port");
+ VIR_AUTOFREE(char *) tlsPort = virXMLPropString(node, "tlsPort");
+ VIR_AUTOFREE(char *) autoport = virXMLPropString(node, "autoport");
+ VIR_AUTOFREE(char *) defaultMode = virXMLPropString(node, "defaultMode");
if (virDomainGraphicsListensParseXML(def, node, ctxt, flags) < 0)
goto error;
@@ -14087,16 +13855,16 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE) {
if (virXMLNodeNameEqual(cur, "channel")) {
- char *name, *mode;
int nameval, modeval;
+ VIR_AUTOFREE(char *) name = NULL;
+ VIR_AUTOFREE(char *) mode = NULL;
+
name = virXMLPropString(cur, "name");
mode = virXMLPropString(cur, "mode");
if (!name || !mode) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("spice channel missing name/mode"));
- VIR_FREE(name);
- VIR_FREE(mode);
goto error;
}
@@ -14104,25 +13872,19 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown spice channel name %s"),
name);
- VIR_FREE(name);
- VIR_FREE(mode);
goto error;
}
if ((modeval = virDomainGraphicsSpiceChannelModeTypeFromString(mode))
< 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown spice channel mode %s"),
mode);
- VIR_FREE(name);
- VIR_FREE(mode);
goto error;
}
- VIR_FREE(name);
- VIR_FREE(mode);
def->data.spice.channels[nameval] = modeval;
} else if (virXMLNodeNameEqual(cur, "image")) {
- char *compression = virXMLPropString(cur, "compression");
int compressionVal;
+ VIR_AUTOFREE(char *) compression = virXMLPropString(cur,
"compression");
if (!compression) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@@ -14135,15 +13897,13 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown spice image compression %s"),
compression);
- VIR_FREE(compression);
goto error;
}
- VIR_FREE(compression);
def->data.spice.image = compressionVal;
} else if (virXMLNodeNameEqual(cur, "jpeg")) {
- char *compression = virXMLPropString(cur, "compression");
int compressionVal;
+ VIR_AUTOFREE(char *) compression = virXMLPropString(cur,
"compression");
if (!compression) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@@ -14156,15 +13916,13 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown spice jpeg compression %s"),
compression);
- VIR_FREE(compression);
goto error;
}
- VIR_FREE(compression);
def->data.spice.jpeg = compressionVal;
} else if (virXMLNodeNameEqual(cur, "zlib")) {
- char *compression = virXMLPropString(cur, "compression");
int compressionVal;
+ VIR_AUTOFREE(char *) compression = virXMLPropString(cur,
"compression");
if (!compression) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@@ -14177,15 +13935,13 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown spice zlib compression %s"),
compression);
- VIR_FREE(compression);
goto error;
}
- VIR_FREE(compression);
def->data.spice.zlib = compressionVal;
} else if (virXMLNodeNameEqual(cur, "playback")) {
- char *compression = virXMLPropString(cur, "compression");
int compressionVal;
+ VIR_AUTOFREE(char *) compression = virXMLPropString(cur,
"compression");
if (!compression) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@@ -14197,16 +13953,14 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
virTristateSwitchTypeFromString(compression)) <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("unknown spice playback compression"));
- VIR_FREE(compression);
goto error;
}
- VIR_FREE(compression);
def->data.spice.playback = compressionVal;
} else if (virXMLNodeNameEqual(cur, "streaming")) {
- char *mode = virXMLPropString(cur, "mode");
int modeVal;
+ VIR_AUTOFREE(char *) mode = virXMLPropString(cur, "mode");
if (!mode) {
virReportError(VIR_ERR_XML_ERROR, "%s",
@@ -14217,16 +13971,14 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
virDomainGraphicsSpiceStreamingModeTypeFromString(mode)) <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("unknown spice streaming mode"));
- VIR_FREE(mode);
goto error;
}
- VIR_FREE(mode);
def->data.spice.streaming = modeVal;
} else if (virXMLNodeNameEqual(cur, "clipboard")) {
- char *copypaste = virXMLPropString(cur, "copypaste");
int copypasteVal;
+ VIR_AUTOFREE(char *) copypaste = virXMLPropString(cur,
"copypaste");
if (!copypaste) {
virReportError(VIR_ERR_XML_ERROR, "%s",
@@ -14238,15 +13990,13 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
virTristateBoolTypeFromString(copypaste)) <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown copypaste value '%s'"),
copypaste);
- VIR_FREE(copypaste);
goto error;
}
- VIR_FREE(copypaste);
def->data.spice.copypaste = copypasteVal;
} else if (virXMLNodeNameEqual(cur, "filetransfer")) {
- char *enable = virXMLPropString(cur, "enable");
int enableVal;
+ VIR_AUTOFREE(char *) enable = virXMLPropString(cur, "enable");
if (!enable) {
virReportError(VIR_ERR_XML_ERROR, "%s",
@@ -14258,21 +14008,18 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
virTristateBoolTypeFromString(enable)) <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown enable value '%s'"),
enable);
- VIR_FREE(enable);
goto error;
}
- VIR_FREE(enable);
def->data.spice.filetransfer = enableVal;
} else if (virXMLNodeNameEqual(cur, "gl")) {
- char *enable = virXMLPropString(cur, "enable");
- char *rendernode = virXMLPropString(cur, "rendernode");
int enableVal;
+ VIR_AUTOFREE(char *) enable = virXMLPropString(cur, "enable");
+ VIR_AUTOFREE(char *) rendernode = virXMLPropString(cur,
"rendernode");
if (!enable) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("spice gl element missing enable"));
- VIR_FREE(rendernode);
goto error;
}
@@ -14280,18 +14027,15 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
virTristateBoolTypeFromString(enable)) <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown enable value '%s'"),
enable);
- VIR_FREE(enable);
- VIR_FREE(rendernode);
goto error;
}
- VIR_FREE(enable);
def->data.spice.gl = enableVal;
VIR_STEAL_PTR(def->data.spice.rendernode, rendernode);
} else if (virXMLNodeNameEqual(cur, "mouse")) {
- char *mode = virXMLPropString(cur, "mode");
int modeVal;
+ VIR_AUTOFREE(char *) mode = virXMLPropString(cur, "mode");
if (!mode) {
virReportError(VIR_ERR_XML_ERROR, "%s",
@@ -14303,10 +14047,8 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown mouse mode value '%s'"),
mode);
- VIR_FREE(mode);
goto error;
}
- VIR_FREE(mode);
def->data.spice.mousemode = modeVal;
}
@@ -14316,10 +14058,6 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
ret = 0;
error:
- VIR_FREE(port);
- VIR_FREE(tlsPort);
- VIR_FREE(autoport);
- VIR_FREE(defaultMode);
return ret;
}
@@ -14368,8 +14106,8 @@ virDomainGraphicsDefParseXML(virDomainXMLOptionPtr xmlopt,
unsigned int flags)
{
virDomainGraphicsDefPtr def;
- char *type = NULL;
int typeVal;
+ VIR_AUTOFREE(char *) type = NULL;
if (!(def = virDomainGraphicsDefNew(xmlopt)))
return NULL;
@@ -14418,8 +14156,6 @@ virDomainGraphicsDefParseXML(virDomainXMLOptionPtr xmlopt,
}
cleanup:
- VIR_FREE(type);
-
return def;
error:
@@ -14432,8 +14168,8 @@ virDomainGraphicsDefParseXML(virDomainXMLOptionPtr xmlopt,
static virDomainSoundCodecDefPtr
virDomainSoundCodecDefParseXML(xmlNodePtr node)
{
- char *type;
virDomainSoundCodecDefPtr def;
+ VIR_AUTOFREE(char *) type = NULL;
if (VIR_ALLOC(def) < 0)
return NULL;
@@ -14446,8 +14182,6 @@ virDomainSoundCodecDefParseXML(xmlNodePtr node)
}
cleanup:
- VIR_FREE(type);
-
return def;
error:
@@ -14463,9 +14197,9 @@ virDomainSoundDefParseXML(virDomainXMLOptionPtr xmlopt,
xmlXPathContextPtr ctxt,
unsigned int flags)
{
- char *model;
virDomainSoundDefPtr def;
xmlNodePtr save = ctxt->node;
+ VIR_AUTOFREE(char *) model = NULL;
if (VIR_ALLOC(def) < 0)
return NULL;
@@ -14482,7 +14216,7 @@ virDomainSoundDefParseXML(virDomainXMLOptionPtr xmlopt,
if (def->model == VIR_DOMAIN_SOUND_MODEL_ICH6 ||
def->model == VIR_DOMAIN_SOUND_MODEL_ICH9) {
int ncodecs;
- xmlNodePtr *codecNodes = NULL;
+ VIR_AUTOFREE(xmlNodePtr *) codecNodes = NULL;
/* parse the <codec> subelements for sound models that support it */
ncodecs = virXPathNodeSet("./codec", ctxt, &codecNodes);
@@ -14492,22 +14226,17 @@ virDomainSoundDefParseXML(virDomainXMLOptionPtr xmlopt,
if (ncodecs > 0) {
size_t i;
- if (VIR_ALLOC_N(def->codecs, ncodecs) < 0) {
- VIR_FREE(codecNodes);
+ if (VIR_ALLOC_N(def->codecs, ncodecs) < 0)
goto error;
- }
for (i = 0; i < ncodecs; i++) {
virDomainSoundCodecDefPtr codec =
virDomainSoundCodecDefParseXML(codecNodes[i]);
- if (codec == NULL) {
- VIR_FREE(codecNodes);
+ if (codec == NULL)
goto error;
- }
codec->cad = def->ncodecs; /* that will do for now */
def->codecs[def->ncodecs++] = codec;
}
- VIR_FREE(codecNodes);
}
}
@@ -14515,8 +14244,6 @@ virDomainSoundDefParseXML(virDomainXMLOptionPtr xmlopt,
goto error;
cleanup:
- VIR_FREE(model);
-
ctxt->node = save;
return def;
@@ -14532,9 +14259,9 @@ virDomainWatchdogDefParseXML(virDomainXMLOptionPtr xmlopt,
xmlNodePtr node,
unsigned int flags)
{
- char *model = NULL;
- char *action = NULL;
virDomainWatchdogDefPtr def;
+ VIR_AUTOFREE(char *) model = NULL;
+ VIR_AUTOFREE(char *) action = NULL;
if (VIR_ALLOC(def) < 0)
return NULL;
@@ -14568,9 +14295,6 @@ virDomainWatchdogDefParseXML(virDomainXMLOptionPtr xmlopt,
goto error;
cleanup:
- VIR_FREE(action);
- VIR_FREE(model);
-
return def;
error:
@@ -14586,13 +14310,13 @@ virDomainRNGDefParseXML(virDomainXMLOptionPtr xmlopt,
xmlXPathContextPtr ctxt,
unsigned int flags)
{
- char *model = NULL;
- char *backend = NULL;
- char *type = NULL;
virDomainRNGDefPtr def;
xmlNodePtr save = ctxt->node;
- xmlNodePtr *backends = NULL;
int nbackends;
+ VIR_AUTOFREE(xmlNodePtr *) backends = NULL;
+ VIR_AUTOFREE(char *) model = NULL;
+ VIR_AUTOFREE(char *) backend = NULL;
+ VIR_AUTOFREE(char *) type = NULL;
if (VIR_ALLOC(def) < 0)
return NULL;
@@ -14684,10 +14408,6 @@ virDomainRNGDefParseXML(virDomainXMLOptionPtr xmlopt,
goto error;
cleanup:
- VIR_FREE(model);
- VIR_FREE(backend);
- VIR_FREE(type);
- VIR_FREE(backends);
ctxt->node = save;
return def;
@@ -14704,11 +14424,11 @@ virDomainMemballoonDefParseXML(virDomainXMLOptionPtr xmlopt,
xmlXPathContextPtr ctxt,
unsigned int flags)
{
- char *model;
- char *deflate = NULL;
virDomainMemballoonDefPtr def;
xmlNodePtr save = ctxt->node;
unsigned int period = 0;
+ VIR_AUTOFREE(char *) model = NULL;
+ VIR_AUTOFREE(char *) deflate = NULL;
if (VIR_ALLOC(def) < 0)
return NULL;
@@ -14755,9 +14475,6 @@ virDomainMemballoonDefParseXML(virDomainXMLOptionPtr xmlopt,
goto error;
cleanup:
- VIR_FREE(model);
- VIR_FREE(deflate);
-
ctxt->node = save;
return def;
@@ -14793,13 +14510,12 @@ virDomainShmemDefParseXML(virDomainXMLOptionPtr xmlopt,
xmlXPathContextPtr ctxt,
unsigned int flags)
{
- char *tmp = NULL;
virDomainShmemDefPtr def = NULL;
virDomainShmemDefPtr ret = NULL;
xmlNodePtr msi = NULL;
xmlNodePtr save = ctxt->node;
xmlNodePtr server = NULL;
-
+ VIR_AUTOFREE(char *) tmp = NULL;
if (VIR_ALLOC(def) < 0)
return NULL;
@@ -14863,7 +14579,6 @@ virDomainShmemDefParseXML(virDomainXMLOptionPtr xmlopt,
}
def->msi.ioeventfd = val;
}
- VIR_FREE(tmp);
}
/* msi option is only relevant with a server */
@@ -14880,7 +14595,6 @@ virDomainShmemDefParseXML(virDomainXMLOptionPtr xmlopt,
VIR_STEAL_PTR(ret, def);
cleanup:
ctxt->node = save;
- VIR_FREE(tmp);
virDomainShmemDefFree(def);
return ret;
}
@@ -14952,7 +14666,7 @@ virSysinfoSystemParseXML(xmlNodePtr node,
{
int ret = -1;
virSysinfoSystemDefPtr def;
- char *tmpUUID = NULL;
+ VIR_AUTOFREE(char *) tmpUUID = NULL;
if (!virXMLNodeNameEqual(node, "system")) {
virReportError(VIR_ERR_XML_ERROR, "%s",
@@ -15013,7 +14727,6 @@ virSysinfoSystemParseXML(xmlNodePtr node,
ret = 0;
cleanup:
virSysinfoSystemDefFree(def);
- VIR_FREE(tmpUUID);
return ret;
}
@@ -15023,10 +14736,11 @@ virSysinfoBaseBoardParseXML(xmlXPathContextPtr ctxt,
size_t *nbaseBoard)
{
int ret = -1;
- virSysinfoBaseBoardDefPtr boards = NULL;
size_t i, nboards = 0;
- xmlNodePtr *nodes = NULL, oldnode = ctxt->node;
+ xmlNodePtr oldnode = ctxt->node;
int n;
+ VIR_AUTOFREE(virSysinfoBaseBoardDefPtr) boards = NULL;
+ VIR_AUTOFREE(xmlNodePtr *) nodes = NULL;
if ((n = virXPathNodeSet("./baseBoard", ctxt, &nodes)) < 0)
return ret;
@@ -15064,8 +14778,6 @@ virSysinfoBaseBoardParseXML(xmlXPathContextPtr ctxt,
*nbaseBoard = nboards;
ret = 0;
cleanup:
- VIR_FREE(boards);
- VIR_FREE(nodes);
ctxt->node = oldnode;
return ret;
}
@@ -15077,9 +14789,9 @@ virSysinfoOEMStringsParseXML(xmlXPathContextPtr ctxt,
{
int ret = -1;
virSysinfoOEMStringsDefPtr def;
- xmlNodePtr *strings = NULL;
int nstrings;
size_t i;
+ VIR_AUTOFREE(xmlNodePtr *) strings = NULL;
nstrings = virXPathNodeSet("./entry", ctxt, &strings);
if (nstrings < 0)
@@ -15100,7 +14812,6 @@ virSysinfoOEMStringsParseXML(xmlXPathContextPtr ctxt,
VIR_STEAL_PTR(*oem, def);
ret = 0;
cleanup:
- VIR_FREE(strings);
virSysinfoOEMStringsDefFree(def);
return ret;
}
@@ -15156,7 +14867,7 @@ virSysinfoParseXML(xmlNodePtr node,
{
virSysinfoDefPtr def;
xmlNodePtr oldnode, tmpnode;
- char *type;
+ VIR_AUTOFREE(char *) type = NULL;
if (!virXMLNodeNameEqual(node, "sysinfo")) {
virReportError(VIR_ERR_XML_ERROR, "%s",
@@ -15229,7 +14940,6 @@ virSysinfoParseXML(xmlNodePtr node,
}
cleanup:
- VIR_FREE(type);
return def;
error:
@@ -15323,9 +15033,9 @@ virDomainVideoAccelDefParseXML(xmlNodePtr node)
{
xmlNodePtr cur;
virDomainVideoAccelDefPtr def;
- char *accel2d = NULL;
- char *accel3d = NULL;
int val;
+ VIR_AUTOFREE(char *) accel2d = NULL;
+ VIR_AUTOFREE(char *) accel3d = NULL;
cur = node->children;
while (cur != NULL) {
@@ -15364,8 +15074,6 @@ virDomainVideoAccelDefParseXML(xmlNodePtr node)
}
cleanup:
- VIR_FREE(accel2d);
- VIR_FREE(accel3d);
return def;
}
@@ -15374,8 +15082,8 @@ virDomainVideoDriverDefParseXML(xmlNodePtr node)
{
xmlNodePtr cur;
virDomainVideoDriverDefPtr def;
- char *vgaconf = NULL;
int val;
+ VIR_AUTOFREE(char *) vgaconf = NULL;
cur = node->children;
while (cur != NULL) {
@@ -15402,7 +15110,6 @@ virDomainVideoDriverDefParseXML(xmlNodePtr node)
def->vgaconf = val;
cleanup:
- VIR_FREE(vgaconf);
return def;
}
@@ -15416,13 +15123,13 @@ virDomainVideoDefParseXML(virDomainXMLOptionPtr xmlopt,
virDomainVideoDefPtr def;
xmlNodePtr cur;
xmlNodePtr saved = ctxt->node;
- char *type = NULL;
- char *heads = NULL;
- char *vram = NULL;
- char *vram64 = NULL;
- char *ram = NULL;
- char *vgamem = NULL;
- char *primary = NULL;
+ VIR_AUTOFREE(char *) type = NULL;
+ VIR_AUTOFREE(char *) heads = NULL;
+ VIR_AUTOFREE(char *) vram = NULL;
+ VIR_AUTOFREE(char *) vram64 = NULL;
+ VIR_AUTOFREE(char *) ram = NULL;
+ VIR_AUTOFREE(char *) vgamem = NULL;
+ VIR_AUTOFREE(char *) primary = NULL;
if (!(def = virDomainVideoDefNew()))
return NULL;
@@ -15529,14 +15236,6 @@ virDomainVideoDefParseXML(virDomainXMLOptionPtr xmlopt,
cleanup:
ctxt->node = saved;
-
- VIR_FREE(type);
- VIR_FREE(ram);
- VIR_FREE(vram);
- VIR_FREE(vram64);
- VIR_FREE(vgamem);
- VIR_FREE(heads);
-
return def;
error:
@@ -15553,8 +15252,8 @@ virDomainHostdevDefParseXML(virDomainXMLOptionPtr xmlopt,
{
virDomainHostdevDefPtr def;
xmlNodePtr save = ctxt->node;
- char *mode = virXMLPropString(node, "mode");
- char *type = virXMLPropString(node, "type");
+ VIR_AUTOFREE(char *) mode = virXMLPropString(node, "mode");
+ VIR_AUTOFREE(char *) type = virXMLPropString(node, "type");
ctxt->node = node;
@@ -15613,8 +15312,6 @@ virDomainHostdevDefParseXML(virDomainXMLOptionPtr xmlopt,
}
cleanup:
- VIR_FREE(type);
- VIR_FREE(mode);
ctxt->node = save;
return def;
@@ -15633,7 +15330,8 @@ virDomainRedirdevDefParseXML(virDomainXMLOptionPtr xmlopt,
{
xmlNodePtr cur;
virDomainRedirdevDefPtr def;
- char *bus = NULL, *type = NULL;
+ VIR_AUTOFREE(char *) bus = NULL;
+ VIR_AUTOFREE(char *) type = NULL;
if (VIR_ALLOC(def) < 0)
return NULL;
@@ -15689,8 +15387,6 @@ virDomainRedirdevDefParseXML(virDomainXMLOptionPtr xmlopt,
cleanup:
- VIR_FREE(bus);
- VIR_FREE(type);
return def;
error:
@@ -15740,10 +15436,12 @@ virDomainRedirFilterUSBVersionHelper(const char *version,
static virDomainRedirFilterUSBDevDefPtr
virDomainRedirFilterUSBDevDefParseXML(xmlNodePtr node)
{
- char *class;
- char *vendor = NULL, *product = NULL;
- char *version = NULL, *allow = NULL;
virDomainRedirFilterUSBDevDefPtr def;
+ VIR_AUTOFREE(char *) class = NULL;
+ VIR_AUTOFREE(char *) vendor = NULL;
+ VIR_AUTOFREE(char *) product = NULL;
+ VIR_AUTOFREE(char *) version = NULL;
+ VIR_AUTOFREE(char *) allow = NULL;
if (VIR_ALLOC(def) < 0)
return NULL;
@@ -15815,11 +15513,6 @@ virDomainRedirFilterUSBDevDefParseXML(xmlNodePtr node)
}
cleanup:
- VIR_FREE(class);
- VIR_FREE(vendor);
- VIR_FREE(product);
- VIR_FREE(version);
- VIR_FREE(allow);
return def;
error:
@@ -15834,9 +15527,9 @@ virDomainRedirFilterDefParseXML(xmlNodePtr node,
{
int n;
size_t i;
- xmlNodePtr *nodes = NULL;
xmlNodePtr save = ctxt->node;
virDomainRedirFilterDefPtr def = NULL;
+ VIR_AUTOFREE(xmlNodePtr *) nodes = NULL;
if (VIR_ALLOC(def) < 0)
goto error;
@@ -15856,13 +15549,11 @@ virDomainRedirFilterDefParseXML(xmlNodePtr node,
goto error;
def->usbdevs[def->nusbdevs++] = usbdev;
}
- VIR_FREE(nodes);
ctxt->node = save;
return def;
error:
- VIR_FREE(nodes);
virDomainRedirFilterDefFree(def);
return NULL;
}
@@ -15875,7 +15566,8 @@ virDomainEventActionParseXML(xmlXPathContextPtr ctxt,
int defaultVal,
virEventActionFromStringFunc convFunc)
{
- char *tmp = virXPathString(xpath, ctxt);
+ VIR_AUTOFREE(char *) tmp = virXPathString(xpath, ctxt);
+
if (tmp == NULL) {
*val = defaultVal;
} else {
@@ -15883,10 +15575,8 @@ virDomainEventActionParseXML(xmlXPathContextPtr ctxt,
if (*val < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown %s action: %s"), name, tmp);
- VIR_FREE(tmp);
return -1;
}
- VIR_FREE(tmp);
}
return 0;
}
@@ -15897,7 +15587,8 @@ virDomainPMStateParseXML(xmlXPathContextPtr ctxt,
int *val)
{
int ret = -1;
- char *tmp = virXPathString(xpath, ctxt);
+ VIR_AUTOFREE(char *) tmp = virXPathString(xpath, ctxt);
+
if (tmp) {
*val = virTristateBoolTypeFromString(tmp);
if (*val < 0) {
@@ -15909,7 +15600,6 @@ virDomainPMStateParseXML(xmlXPathContextPtr ctxt,
ret = 0;
cleanup:
- VIR_FREE(tmp);
return ret;
}
@@ -15918,10 +15608,10 @@ static int
virDomainPerfEventDefParseXML(virDomainPerfDefPtr perf,
xmlNodePtr node)
{
- char *name = NULL;
- char *enabled = NULL;
int event;
int ret = -1;
+ VIR_AUTOFREE(char *) name = NULL;
+ VIR_AUTOFREE(char *) enabled = NULL;
if (!(name = virXMLPropString(node, "name"))) {
virReportError(VIR_ERR_XML_ERROR, "%s", _("missing perf event
name"));
@@ -15956,8 +15646,6 @@ virDomainPerfEventDefParseXML(virDomainPerfDefPtr perf,
ret = 0;
cleanup:
- VIR_FREE(name);
- VIR_FREE(enabled);
return ret;
}
@@ -15967,8 +15655,8 @@ virDomainPerfDefParseXML(virDomainDefPtr def,
{
size_t i;
int ret = -1;
- xmlNodePtr *nodes = NULL;
int n;
+ VIR_AUTOFREE(xmlNodePtr *) nodes = NULL;
if ((n = virXPathNodeSet("./perf/event", ctxt, &nodes)) < 0)
return n;
@@ -15981,7 +15669,6 @@ virDomainPerfDefParseXML(virDomainDefPtr def,
ret = 0;
cleanup:
- VIR_FREE(nodes);
return ret;
}
@@ -15991,9 +15678,9 @@ virDomainMemorySourceDefParseXML(xmlNodePtr node,
virDomainMemoryDefPtr def)
{
int ret = -1;
- char *nodemask = NULL;
xmlNodePtr save = ctxt->node;
ctxt->node = node;
+ VIR_AUTOFREE(char *) nodemask = NULL;
switch ((virDomainMemoryModel) def->model) {
case VIR_DOMAIN_MEMORY_MODEL_DIMM:
@@ -16038,7 +15725,6 @@ virDomainMemorySourceDefParseXML(xmlNodePtr node,
ret = 0;
cleanup:
- VIR_FREE(nodemask);
ctxt->node = save;
return ret;
}
@@ -16101,10 +15787,10 @@ static virDomainSEVDefPtr
virDomainSEVDefParseXML(xmlNodePtr sevNode,
xmlXPathContextPtr ctxt)
{
- char *type = NULL;
xmlNodePtr save = ctxt->node;
virDomainSEVDefPtr def;
unsigned long policy;
+ VIR_AUTOFREE(char *) type = NULL;
if (VIR_ALLOC(def) < 0)
return NULL;
@@ -16154,7 +15840,6 @@ virDomainSEVDefParseXML(xmlNodePtr sevNode,
def->session = virXPathString("string(./session)", ctxt);
cleanup:
- VIR_FREE(type);
ctxt->node = save;
return def;
@@ -16170,11 +15855,11 @@ virDomainMemoryDefParseXML(virDomainXMLOptionPtr xmlopt,
xmlXPathContextPtr ctxt,
unsigned int flags)
{
- char *tmp = NULL;
xmlNodePtr save = ctxt->node;
xmlNodePtr node;
virDomainMemoryDefPtr def;
int val;
+ VIR_AUTOFREE(char *) tmp = NULL;
if (VIR_ALLOC(def) < 0)
return NULL;
@@ -16214,7 +15899,6 @@ virDomainMemoryDefParseXML(virDomainXMLOptionPtr xmlopt,
def->discard = val;
}
- VIR_FREE(tmp);
/* source */
if ((node = virXPathNode("./source", ctxt)) &&
@@ -16239,7 +15923,6 @@ virDomainMemoryDefParseXML(virDomainXMLOptionPtr xmlopt,
return def;
error:
- VIR_FREE(tmp);
virDomainMemoryDefFree(def);
ctxt->node = save;
return NULL;
@@ -16250,11 +15933,12 @@ static virDomainIOMMUDefPtr
virDomainIOMMUDefParseXML(xmlNodePtr node,
xmlXPathContextPtr ctxt)
{
- virDomainIOMMUDefPtr iommu = NULL, ret = NULL;
+ virDomainIOMMUDefPtr ret = NULL;
xmlNodePtr save = ctxt->node;
xmlNodePtr driver;
- char *tmp = NULL;
int val;
+ VIR_AUTOFREE(char *) tmp = NULL;
+ VIR_AUTOFREE(virDomainIOMMUDefPtr) iommu = NULL;
ctxt->node = node;
@@ -16315,8 +15999,6 @@ virDomainIOMMUDefParseXML(xmlNodePtr node,
cleanup:
ctxt->node = save;
- VIR_FREE(iommu);
- VIR_FREE(tmp);
return ret;
}
@@ -16327,11 +16009,12 @@ virDomainVsockDefParseXML(virDomainXMLOptionPtr xmlopt,
xmlXPathContextPtr ctxt,
unsigned int flags)
{
- virDomainVsockDefPtr vsock = NULL, ret = NULL;
+ virDomainVsockDefPtr ret = NULL;
xmlNodePtr save = ctxt->node;
xmlNodePtr cid;
- char *tmp = NULL;
int val;
+ VIR_AUTOFREE(char *) tmp = NULL;
+ VIR_AUTOFREE(virDomainVsockDefPtr) vsock = NULL;
ctxt->node = node;
@@ -16380,8 +16063,6 @@ virDomainVsockDefParseXML(virDomainXMLOptionPtr xmlopt,
cleanup:
ctxt->node = save;
- VIR_FREE(vsock);
- VIR_FREE(tmp);
return ret;
}
@@ -17975,17 +17656,15 @@ virDomainDefGetDefaultEmulator(virDomainDefPtr def,
virCapsPtr caps)
{
char *retemu;
- virCapsDomainDataPtr capsdata;
+ VIR_AUTOFREE(virCapsDomainDataPtr) capsdata = NULL;
if (!(capsdata = virCapabilitiesDomainDataLookup(caps, def->os.type,
def->os.arch, def->virtType, NULL, NULL)))
return NULL;
- if (VIR_STRDUP(retemu, capsdata->emulator) < 0) {
- VIR_FREE(capsdata);
+ if (VIR_STRDUP(retemu, capsdata->emulator) < 0)
return NULL;
- }
- VIR_FREE(capsdata);
+
return retemu;
}
@@ -17993,12 +17672,12 @@ static int
virDomainDefParseBootXML(xmlXPathContextPtr ctxt,
virDomainDefPtr def)
{
- xmlNodePtr *nodes = NULL;
xmlNodePtr node;
size_t i;
int n;
- char *tmp = NULL;
int ret = -1;
+ VIR_AUTOFREE(char *) tmp = NULL;
+ VIR_AUTOFREE(xmlNodePtr *) nodes = NULL;
/* analysis of the boot devices */
if ((n = virXPathNodeSet("./os/boot", ctxt, &nodes)) < 0)
@@ -18080,8 +17759,6 @@ virDomainDefParseBootXML(xmlXPathContextPtr ctxt,
ret = 0;
cleanup:
- VIR_FREE(tmp);
- VIR_FREE(nodes);
return ret;
}
@@ -18162,7 +17839,7 @@ static virDomainIOThreadIDDefPtr
virDomainIOThreadIDDefParseXML(xmlNodePtr node)
{
virDomainIOThreadIDDefPtr iothrid;
- char *tmp = NULL;
+ VIR_AUTOFREE(char *) tmp = NULL;
if (VIR_ALLOC(iothrid) < 0)
return NULL;
@@ -18180,7 +17857,6 @@ virDomainIOThreadIDDefParseXML(xmlNodePtr node)
}
cleanup:
- VIR_FREE(tmp);
return iothrid;
error:
@@ -18195,10 +17871,10 @@ virDomainDefParseIOThreads(virDomainDefPtr def,
xmlXPathContextPtr ctxt)
{
size_t i;
- char *tmp;
int n = 0;
unsigned int iothreads = 0;
- xmlNodePtr *nodes = NULL;
+ VIR_AUTOFREE(char *) tmp = NULL;
+ VIR_AUTOFREE(xmlNodePtr *) nodes = NULL;
tmp = virXPathString("string(./iothreads[1])", ctxt);
if (tmp && virStrToLong_uip(tmp, NULL, 10, &iothreads) < 0) {
@@ -18206,7 +17882,6 @@ virDomainDefParseIOThreads(virDomainDefPtr def,
_("invalid iothreads count '%s'"), tmp);
goto error;
}
- VIR_FREE(tmp);
/* Extract any iothread id's defined */
if ((n = virXPathNodeSet("./iothreadids/iothread", ctxt, &nodes)) <
0)
@@ -18232,7 +17907,6 @@ virDomainDefParseIOThreads(virDomainDefPtr def,
}
def->iothreadids[def->niothreadids++] = iothrid;
}
- VIR_FREE(nodes);
if (virDomainIOThreadIDDefArrayInit(def, iothreads) < 0)
goto error;
@@ -18240,7 +17914,6 @@ virDomainDefParseIOThreads(virDomainDefPtr def,
return 0;
error:
- VIR_FREE(nodes);
return -1;
}
@@ -18256,8 +17929,8 @@ virDomainVcpuPinDefParseXML(virDomainDefPtr def,
{
virDomainVcpuDefPtr vcpu;
unsigned int vcpuid;
- char *tmp = NULL;
int ret = -1;
+ VIR_AUTOFREE(char *) tmp = NULL;
if (!(tmp = virXMLPropString(node, "vcpu"))) {
virReportError(VIR_ERR_XML_ERROR, "%s", _("missing vcpu id in
vcpupin"));
@@ -18301,7 +17974,6 @@ virDomainVcpuPinDefParseXML(virDomainDefPtr def,
ret = 0;
cleanup:
- VIR_FREE(tmp);
return ret;
}
@@ -18317,7 +17989,7 @@ virDomainIOThreadPinDefParseXML(xmlNodePtr node,
int ret = -1;
virDomainIOThreadIDDefPtr iothrid;
unsigned int iothreadid;
- char *tmp = NULL;
+ VIR_AUTOFREE(char *) tmp = NULL;
VIR_AUTOPTR(virBitmap) cpumask = NULL;
if (!(tmp = virXMLPropString(node, "iothread"))) {
@@ -18373,7 +18045,6 @@ virDomainIOThreadPinDefParseXML(xmlNodePtr node,
ret = 0;
cleanup:
- VIR_FREE(tmp);
return ret;
}
@@ -18386,7 +18057,7 @@ static virBitmapPtr
virDomainEmulatorPinDefParseXML(xmlNodePtr node)
{
virBitmapPtr ret = NULL;
- char *tmp = NULL;
+ VIR_AUTOFREE(char *) tmp = NULL;
VIR_AUTOPTR(virBitmap) def = NULL;
if (!(tmp = virXMLPropString(node, "cpuset"))) {
@@ -18407,7 +18078,6 @@ virDomainEmulatorPinDefParseXML(xmlNodePtr node)
VIR_STEAL_PTR(ret, def);
cleanup:
- VIR_FREE(tmp);
return ret;
}
@@ -18543,7 +18213,7 @@ virDomainHugepagesParseXML(xmlNodePtr node,
{
int ret = -1;
xmlNodePtr oldnode = ctxt->node;
- char *nodeset = NULL;
+ VIR_AUTOFREE(char *) nodeset = NULL;
ctxt->node = node;
@@ -18571,7 +18241,6 @@ virDomainHugepagesParseXML(xmlNodePtr node,
ret = 0;
cleanup:
- VIR_FREE(nodeset);
ctxt->node = oldnode;
return ret;
}
@@ -18648,9 +18317,9 @@ virDomainLoaderDefParseXML(xmlNodePtr node,
virDomainLoaderDefPtr loader)
{
int ret = -1;
- char *readonly_str = NULL;
- char *secure_str = NULL;
- char *type_str = NULL;
+ VIR_AUTOFREE(char *) readonly_str = NULL;
+ VIR_AUTOFREE(char *) secure_str = NULL;
+ VIR_AUTOFREE(char *) type_str = NULL;
readonly_str = virXMLPropString(node, "readonly");
secure_str = virXMLPropString(node, "secure");
@@ -18683,9 +18352,6 @@ virDomainLoaderDefParseXML(xmlNodePtr node,
ret = 0;
cleanup:
- VIR_FREE(readonly_str);
- VIR_FREE(secure_str);
- VIR_FREE(type_str);
return ret;
}
@@ -18697,8 +18363,8 @@ virDomainSchedulerParse(xmlNodePtr node,
int *priority)
{
virBitmapPtr ret = NULL;
- char *tmp = NULL;
int pol = 0;
+ VIR_AUTOFREE(char *) tmp = NULL;
if (!(tmp = virXMLPropString(node, name))) {
virReportError(VIR_ERR_XML_ERROR,
@@ -18747,13 +18413,11 @@ virDomainSchedulerParse(xmlNodePtr node,
_("Invalid value for element priority"));
goto error;
}
- VIR_FREE(tmp);
}
return ret;
error:
- VIR_FREE(tmp);
virBitmapFree(ret);
return NULL;
}
@@ -18836,13 +18500,13 @@ virDomainVcpuParse(virDomainDefPtr def,
virDomainXMLOptionPtr xmlopt)
{
int n;
- xmlNodePtr *nodes = NULL;
xmlNodePtr vcpuNode;
size_t i;
- char *tmp = NULL;
unsigned int maxvcpus;
unsigned int vcpus;
int ret = -1;
+ VIR_AUTOFREE(char *) tmp = NULL;
+ VIR_AUTOFREE(xmlNodePtr *) nodes = NULL;
vcpus = maxvcpus = 1;
@@ -18976,9 +18640,6 @@ virDomainVcpuParse(virDomainDefPtr def,
ret = 0;
cleanup:
- VIR_FREE(nodes);
- VIR_FREE(tmp);
-
return ret;
}
@@ -18987,12 +18648,12 @@ static int
virDomainDefParseBootOptions(virDomainDefPtr def,
xmlXPathContextPtr ctxt)
{
- xmlNodePtr *nodes = NULL;
- char *tmp = NULL;
char *name = NULL;
int ret = -1;
size_t i;
int n;
+ VIR_AUTOFREE(xmlNodePtr *) nodes = NULL;
+ VIR_AUTOFREE(char *) tmp = NULL;
/*
* Booting options for different OS types....
@@ -19123,8 +18784,6 @@ virDomainDefParseBootOptions(virDomainDefPtr def,
ret = 0;
error:
- VIR_FREE(nodes);
- VIR_FREE(tmp);
return ret;
}
@@ -19134,8 +18793,8 @@ virDomainResctrlParseVcpus(virDomainDefPtr def,
xmlNodePtr node,
virBitmapPtr *vcpus)
{
- char *vcpus_str = NULL;
int ret = -1;
+ VIR_AUTOFREE(char *) vcpus_str = NULL;
vcpus_str = virXMLPropString(node, "vcpus");
if (!vcpus_str) {
@@ -19156,7 +18815,6 @@ virDomainResctrlParseVcpus(virDomainDefPtr def,
ret = 0;
cleanup:
- VIR_FREE(vcpus_str);
return ret;
}
@@ -19196,8 +18854,8 @@ virDomainCachetuneDefParseCache(xmlXPathContextPtr ctxt,
unsigned int cache;
int type;
unsigned long long size;
- char *tmp = NULL;
int ret = -1;
+ VIR_AUTOFREE(char *) tmp = NULL;
ctxt->node = node;
@@ -19242,7 +18900,6 @@ virDomainCachetuneDefParseCache(xmlXPathContextPtr ctxt,
tmp);
goto cleanup;
}
- VIR_FREE(tmp);
if (virDomainParseScaledValue("./@size", "./@unit",
ctxt, &size, 1024,
@@ -19255,7 +18912,6 @@ virDomainCachetuneDefParseCache(xmlXPathContextPtr ctxt,
ret = 0;
cleanup:
ctxt->node = oldnode;
- VIR_FREE(tmp);
return ret;
}
@@ -19328,14 +18984,14 @@ virDomainResctrlMonDefParse(virDomainDefPtr def,
{
virDomainResctrlMonDefPtr domresmon = NULL;
xmlNodePtr oldnode = ctxt->node;
- xmlNodePtr *nodes = NULL;
unsigned int level = 0;
- char *tmp = NULL;
- char *id = NULL;
size_t i = 0;
int n = 0;
int rv = -1;
int ret = -1;
+ VIR_AUTOFREE(xmlNodePtr *) nodes = NULL;
+ VIR_AUTOFREE(char *) tmp = NULL;
+ VIR_AUTOFREE(char *) id = NULL;
ctxt->node = node;
@@ -19423,9 +19079,6 @@ virDomainResctrlMonDefParse(virDomainDefPtr def,
ret = 0;
cleanup:
ctxt->node = oldnode;
- VIR_FREE(id);
- VIR_FREE(tmp);
- VIR_FREE(nodes);
virDomainResctrlMonDefFree(domresmon);
return ret;
}
@@ -19437,10 +19090,10 @@ virDomainResctrlNew(xmlNodePtr node,
virBitmapPtr vcpus,
unsigned int flags)
{
- char *vcpus_str = NULL;
- char *alloc_id = NULL;
virDomainResctrlDefPtr resctrl = NULL;
virDomainResctrlDefPtr ret = NULL;
+ VIR_AUTOFREE(char *) vcpus_str = NULL;
+ VIR_AUTOFREE(char *) alloc_id = NULL;
/* We need to format it back because we need to be consistent in the naming
* even when users specify some "sub-optimal" string there. */
@@ -19478,8 +19131,6 @@ virDomainResctrlNew(xmlNodePtr node,
VIR_STEAL_PTR(ret, resctrl);
cleanup:
virDomainResctrlDefFree(resctrl);
- VIR_FREE(alloc_id);
- VIR_FREE(vcpus_str);
return ret;
}
@@ -19491,13 +19142,13 @@ virDomainCachetuneDefParse(virDomainDefPtr def,
unsigned int flags)
{
xmlNodePtr oldnode = ctxt->node;
- xmlNodePtr *nodes = NULL;
virResctrlAllocPtr alloc = NULL;
virDomainResctrlDefPtr resctrl = NULL;
ssize_t i = 0;
int n;
int ret = -1;
VIR_AUTOPTR(virBitmap) vcpus = NULL;
+ VIR_AUTOFREE(xmlNodePtr *) nodes = NULL;
ctxt->node = node;
@@ -19557,7 +19208,6 @@ virDomainCachetuneDefParse(virDomainDefPtr def,
ctxt->node = oldnode;
virDomainResctrlDefFree(resctrl);
virObjectUnref(alloc);
- VIR_FREE(nodes);
return ret;
}
@@ -19569,10 +19219,10 @@ virDomainDefParseCaps(virDomainDefPtr def,
unsigned int flags)
{
int ret = -1;
- char *virttype = NULL;
- char *arch = NULL;
- char *ostype = NULL;
- virCapsDomainDataPtr capsdata = NULL;
+ VIR_AUTOFREE(char *) virttype = NULL;
+ VIR_AUTOFREE(char *) arch = NULL;
+ VIR_AUTOFREE(char *) ostype = NULL;
+ VIR_AUTOFREE(virCapsDomainDataPtr) capsdata = NULL;
virttype = virXPathString("string(./@type)", ctxt);
ostype = virXPathString("string(./os/type[1])", ctxt);
@@ -19643,10 +19293,6 @@ virDomainDefParseCaps(virDomainDefPtr def,
ret = 0;
cleanup:
- VIR_FREE(virttype);
- VIR_FREE(ostype);
- VIR_FREE(arch);
- VIR_FREE(capsdata);
return ret;
}
@@ -19659,8 +19305,8 @@ virDomainMemorytuneDefParseMemory(xmlXPathContextPtr ctxt,
xmlNodePtr oldnode = ctxt->node;
unsigned int id;
unsigned int bandwidth;
- char *tmp = NULL;
int ret = -1;
+ VIR_AUTOFREE(char *) tmp = NULL;
ctxt->node = node;
@@ -19690,14 +19336,12 @@ virDomainMemorytuneDefParseMemory(xmlXPathContextPtr ctxt,
tmp);
goto cleanup;
}
- VIR_FREE(tmp);
if (virResctrlAllocSetMemoryBandwidth(alloc, id, bandwidth) < 0)
goto cleanup;
ret = 0;
cleanup:
ctxt->node = oldnode;
- VIR_FREE(tmp);
return ret;
}
@@ -19709,10 +19353,10 @@ virDomainMemorytuneDefParse(virDomainDefPtr def,
unsigned int flags)
{
xmlNodePtr oldnode = ctxt->node;
- xmlNodePtr *nodes = NULL;
virResctrlAllocPtr alloc = NULL;
virDomainResctrlDefPtr resctrl = NULL;
VIR_AUTOPTR(virBitmap) vcpus = NULL;
+ VIR_AUTOFREE(xmlNodePtr *) nodes = NULL;
ssize_t i = 0;
int n;
@@ -19771,7 +19415,6 @@ virDomainMemorytuneDefParse(virDomainDefPtr def,
ctxt->node = oldnode;
virDomainResctrlDefFree(resctrl);
virObjectUnref(alloc);
- VIR_FREE(nodes);
return ret;
}
@@ -19784,8 +19427,7 @@ virDomainDefParseXML(xmlDocPtr xml,
virDomainXMLOptionPtr xmlopt,
unsigned int flags)
{
- xmlNodePtr *nodes = NULL, node = NULL;
- char *tmp = NULL;
+ xmlNodePtr node = NULL;
size_t i, j;
int n, gic_version;
long id = -1;
@@ -19795,18 +19437,19 @@ virDomainDefParseXML(xmlDocPtr xml,
bool usb_other = false;
bool usb_master = false;
char *netprefix = NULL;
+ VIR_AUTOFREE(xmlNodePtr *) nodes = NULL;
+ VIR_AUTOFREE(char *) tmp = NULL;
if (flags & VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA) {
- char *schema = virFileFindResource("domain.rng",
- abs_topsrcdir "/docs/schemas",
- PKGDATADIR "/schemas");
+ VIR_AUTOFREE(char *) schema = NULL;
+
+ schema = virFileFindResource("domain.rng",
+ abs_topsrcdir "/docs/schemas",
+ PKGDATADIR "/schemas");
if (!schema)
return NULL;
- if (virXMLValidateAgainstSchema(schema, xml) < 0) {
- VIR_FREE(schema);
+ if (virXMLValidateAgainstSchema(schema, xml) < 0)
return NULL;
- }
- VIR_FREE(schema);
}
if (!(def = virDomainDefNew()))
@@ -21453,7 +21096,6 @@ virDomainDefParseXML(xmlDocPtr xml,
def->idmap.ngidmap = n;
}
- VIR_FREE(nodes);
if ((def->idmap.uidmap && !def->idmap.gidmap) ||
(!def->idmap.uidmap && def->idmap.gidmap)) {
@@ -21482,7 +21124,6 @@ virDomainDefParseXML(xmlDocPtr xml,
goto error;
}
def->os.smbios_mode = mode;
- VIR_FREE(tmp);
}
if (virDomainKeyWrapDefParseXML(def, ctxt) < 0)
@@ -21504,8 +21145,6 @@ virDomainDefParseXML(xmlDocPtr xml,
return def;
error:
- VIR_FREE(tmp);
- VIR_FREE(nodes);
virDomainDefFree(def);
return NULL;
}
@@ -21518,17 +21157,17 @@ virDomainObjParseXML(xmlDocPtr xml,
virDomainXMLOptionPtr xmlopt,
unsigned int flags)
{
- char *tmp = NULL;
long val;
xmlNodePtr config;
xmlNodePtr oldnode;
virDomainObjPtr obj;
- xmlNodePtr *nodes = NULL;
size_t i;
int n;
int state;
int reason = 0;
void *parseOpaque = NULL;
+ VIR_AUTOFREE(char *) tmp = NULL;
+ VIR_AUTOFREE(xmlNodePtr *) nodes = NULL;
if (!(obj = virDomainObjNew(xmlopt)))
return NULL;
@@ -21554,7 +21193,6 @@ virDomainObjParseXML(xmlDocPtr xml,
if ((state = virDomainStateTypeFromString(tmp)) < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("invalid domain state '%s'"), tmp);
- VIR_FREE(tmp);
goto error;
}
VIR_FREE(tmp);
@@ -21563,10 +21201,8 @@ virDomainObjParseXML(xmlDocPtr xml,
if ((reason = virDomainStateReasonFromString(state, tmp)) < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("invalid domain state reason '%s'"),
tmp);
- VIR_FREE(tmp);
goto error;
}
- VIR_FREE(tmp);
}
virDomainObjSetState(obj, state, reason);
@@ -21594,7 +21230,6 @@ virDomainObjParseXML(xmlDocPtr xml,
virDomainObjTaint(obj, flag);
}
}
- VIR_FREE(nodes);
if (xmlopt->privateData.parse &&
xmlopt->privateData.parse(ctxt, obj, &xmlopt->config) < 0)
@@ -21615,7 +21250,6 @@ virDomainObjParseXML(xmlDocPtr xml,
error:
virObjectUnref(obj);
- VIR_FREE(nodes);
return NULL;
}
@@ -23152,8 +22786,8 @@ virDomainDefCheckABIStabilityFlags(virDomainDefPtr src,
{
size_t i;
virErrorPtr err;
- char *strSrc;
- char *strDst;
+ VIR_AUTOFREE(char *) strSrc = NULL;
+ VIR_AUTOFREE(char *) strDst = NULL;
if (src->virtType != dst->virtType) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
@@ -23622,8 +23256,6 @@ virDomainDefCheckABIStabilityFlags(virDomainDefPtr src,
strDst = virDomainDefFormat(dst, NULL, 0);
VIR_DEBUG("XMLs that failed stability check were: src=\"%s\",
dst=\"%s\"",
NULLSTR(strSrc), NULLSTR(strDst));
- VIR_FREE(strSrc);
- VIR_FREE(strDst);
if (err) {
virSetError(err);
@@ -24083,7 +23715,7 @@ virDomainDiskSourceFormatNetwork(virBufferPtr attrBuf,
unsigned int flags)
{
size_t n;
- char *path = NULL;
+ VIR_AUTOFREE(char *) path = NULL;
virBufferAsprintf(attrBuf, " protocol='%s'",
virStorageNetProtocolTypeToString(src->protocol));
@@ -24095,8 +23727,6 @@ virDomainDiskSourceFormatNetwork(virBufferPtr attrBuf,
virBufferEscapeString(attrBuf, " name='%s'", path ? path :
src->path);
- VIR_FREE(path);
-
if (src->haveTLS != VIR_TRISTATE_BOOL_ABSENT &&
!(flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE &&
src->tlsFromConfig))
@@ -26531,8 +26161,8 @@ static int
virDomainMemorySourceDefFormat(virBufferPtr buf,
virDomainMemoryDefPtr def)
{
- char *bitmap = NULL;
int ret = -1;
+ VIR_AUTOFREE(char *) bitmap = NULL;
if (!def->pagesize && !def->sourceNodes &&
!def->nvdimmPath)
return 0;
@@ -26576,7 +26206,6 @@ virDomainMemorySourceDefFormat(virBufferPtr buf,
ret = 0;
cleanup:
- VIR_FREE(bitmap);
return ret;
}
@@ -27727,7 +27356,7 @@ virDomainResctrlMonDefFormatHelper(virDomainResctrlMonDefPtr
domresmon,
virResctrlMonitorType tag,
virBufferPtr buf)
{
- char *vcpus = NULL;
+ VIR_AUTOFREE(char *) vcpus = NULL;
if (domresmon->tag != tag)
return 0;
@@ -27745,7 +27374,6 @@ virDomainResctrlMonDefFormatHelper(virDomainResctrlMonDefPtr
domresmon,
virBufferAsprintf(buf, "vcpus='%s'/>\n", vcpus);
- VIR_FREE(vcpus);
return 0;
}
@@ -27756,9 +27384,9 @@ virDomainCachetuneDefFormat(virBufferPtr buf,
unsigned int flags)
{
virBuffer childrenBuf = VIR_BUFFER_INITIALIZER;
- char *vcpus = NULL;
size_t i = 0;
int ret = -1;
+ VIR_AUTOFREE(char *) vcpus = NULL;
virBufferSetChildIndent(&childrenBuf, buf);
if (virResctrlAllocForeachCache(resctrl->alloc,
@@ -27802,7 +27430,6 @@ virDomainCachetuneDefFormat(virBufferPtr buf,
ret = 0;
cleanup:
virBufferFreeAndReset(&childrenBuf);
- VIR_FREE(vcpus);
return ret;
}
@@ -27827,8 +27454,8 @@ virDomainMemorytuneDefFormat(virBufferPtr buf,
unsigned int flags)
{
virBuffer childrenBuf = VIR_BUFFER_INITIALIZER;
- char *vcpus = NULL;
int ret = -1;
+ VIR_AUTOFREE(char *) vcpus = NULL;
virBufferSetChildIndent(&childrenBuf, buf);
if (virResctrlAllocForeachMemory(resctrl->alloc,
@@ -27865,7 +27492,6 @@ virDomainMemorytuneDefFormat(virBufferPtr buf,
ret = 0;
cleanup:
virBufferFreeAndReset(&childrenBuf);
- VIR_FREE(vcpus);
return ret;
}
@@ -28000,8 +27626,8 @@ virDomainCpuDefFormat(virBufferPtr buf,
{
virDomainVcpuDefPtr vcpu;
size_t i;
- char *cpumask = NULL;
int ret = -1;
+ VIR_AUTOFREE(char *) cpumask = NULL;
virBufferAddLit(buf, "<vcpu");
virBufferAsprintf(buf, " placement='%s'",
@@ -28040,8 +27666,6 @@ virDomainCpuDefFormat(virBufferPtr buf,
ret = 0;
cleanup:
- VIR_FREE(cpumask);
-
return ret;
}
@@ -29246,8 +28870,8 @@ virDomainSaveXML(const char *configDir,
const char *xml)
{
char uuidstr[VIR_UUID_STRING_BUFLEN];
- char *configFile = NULL;
int ret = -1;
+ VIR_AUTOFREE(char *) configFile = NULL;
if (!configDir)
return 0;
@@ -29268,7 +28892,6 @@ virDomainSaveXML(const char *configDir,
xml);
cleanup:
- VIR_FREE(configFile);
return ret;
}
@@ -29278,7 +28901,7 @@ virDomainSaveConfig(const char *configDir,
virDomainDefPtr def)
{
int ret = -1;
- char *xml;
+ VIR_AUTOFREE(char *) xml = NULL;
if (!(xml = virDomainDefFormat(def, caps, VIR_DOMAIN_DEF_FORMAT_SECURE)))
goto cleanup;
@@ -29288,7 +28911,6 @@ virDomainSaveConfig(const char *configDir,
ret = 0;
cleanup:
- VIR_FREE(xml);
return ret;
}
@@ -29305,7 +28927,7 @@ virDomainSaveStatus(virDomainXMLOptionPtr xmlopt,
VIR_DOMAIN_DEF_FORMAT_CLOCK_ADJUST);
int ret = -1;
- char *xml;
+ VIR_AUTOFREE(char *) xml = NULL;
if (!(xml = virDomainObjFormat(xmlopt, obj, caps, flags)))
goto cleanup;
@@ -29315,7 +28937,6 @@ virDomainSaveStatus(virDomainXMLOptionPtr xmlopt,
ret = 0;
cleanup:
- VIR_FREE(xml);
return ret;
}
@@ -29325,8 +28946,9 @@ virDomainDeleteConfig(const char *configDir,
const char *autostartDir,
virDomainObjPtr dom)
{
- char *configFile = NULL, *autostartLink = NULL;
int ret = -1;
+ VIR_AUTOFREE(char *) configFile = NULL;
+ VIR_AUTOFREE(char *) autostartLink = NULL;
if ((configFile = virDomainConfigFile(configDir, dom->def->name)) == NULL)
goto cleanup;
@@ -29349,8 +28971,6 @@ virDomainDeleteConfig(const char *configDir,
ret = 0;
cleanup:
- VIR_FREE(configFile);
- VIR_FREE(autostartLink);
return ret;
}
@@ -29616,7 +29236,7 @@ virDomainDiskDefForeachPath(virDomainDiskDefPtr disk,
int ret = -1;
size_t depth = 0;
virStorageSourcePtr tmp;
- char *brokenRaw = NULL;
+ VIR_AUTOFREE(char *) brokenRaw = NULL;
if (!ignoreOpenFailure) {
if (virStorageFileChainGetBroken(disk->src, &brokenRaw) < 0)
@@ -29644,7 +29264,6 @@ virDomainDiskDefForeachPath(virDomainDiskDefPtr disk,
ret = 0;
cleanup:
- VIR_FREE(brokenRaw);
return ret;
}
@@ -29660,11 +29279,11 @@ virDomainDefCopy(virDomainDefPtr src,
void *parseOpaque,
bool migratable)
{
- char *xml;
virDomainDefPtr ret;
unsigned int format_flags = VIR_DOMAIN_DEF_FORMAT_SECURE;
unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE |
VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE;
+ VIR_AUTOFREE(char *) xml = NULL;
if (migratable)
format_flags |= VIR_DOMAIN_DEF_FORMAT_INACTIVE |
VIR_DOMAIN_DEF_FORMAT_MIGRATABLE;
@@ -29675,7 +29294,6 @@ virDomainDefCopy(virDomainDefPtr src,
ret = virDomainDefParseString(xml, caps, xmlopt, parseOpaque, parse_flags);
- VIR_FREE(xml);
return ret;
}
@@ -30103,9 +29721,9 @@ virDomainDeviceDefCopy(virDomainDeviceDefPtr src,
virDomainDeviceDefPtr ret = NULL;
virBuffer buf = VIR_BUFFER_INITIALIZER;
int flags = VIR_DOMAIN_DEF_FORMAT_INACTIVE | VIR_DOMAIN_DEF_FORMAT_SECURE;
- char *xmlStr = NULL;
int rc = -1;
char *netprefix;
+ VIR_AUTOFREE(char *) xmlStr = NULL;
switch ((virDomainDeviceType) src->type) {
case VIR_DOMAIN_DEVICE_DISK:
@@ -30192,7 +29810,6 @@ virDomainDeviceDefCopy(virDomainDeviceDefPtr src,
VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE);
cleanup:
- VIR_FREE(xmlStr);
return ret;
}
@@ -30523,8 +30140,8 @@ virDomainDefGetShortName(const virDomainDef *def)
{
wchar_t wshortname[VIR_DOMAIN_SHORT_NAME_MAX + 1] = {0};
size_t len = 0;
- char *shortname = NULL;
char *ret = NULL;
+ VIR_AUTOFREE(char *) shortname = NULL;
/* No need to do the whole conversion thing when there are no multibyte
* characters. The same applies for illegal sequences as they can occur
@@ -30571,7 +30188,6 @@ virDomainDefGetShortName(const virDomainDef *def)
ignore_value(virAsprintf(&ret, "%d-%s", def->id, shortname));
cleanup:
- VIR_FREE(shortname);
return ret;
}
@@ -30850,9 +30466,9 @@ virDomainNetResolveActualType(virDomainNetDefPtr iface)
{
virConnectPtr conn = NULL;
virNetworkPtr net = NULL;
- char *xml = NULL;
virNetworkDefPtr def = NULL;
int ret = -1;
+ VIR_AUTOFREE(char *) xml = NULL;
if (iface->type != VIR_DOMAIN_NET_TYPE_NETWORK)
return iface->type;
@@ -30919,7 +30535,6 @@ virDomainNetResolveActualType(virDomainNetDefPtr iface)
cleanup:
virNetworkDefFree(def);
- VIR_FREE(xml);
virObjectUnref(conn);
virObjectUnref(net);
return ret;
@@ -31048,10 +30663,10 @@ virDomainDiskTranslateSourcePool(virDomainDiskDefPtr def)
virConnectPtr conn = NULL;
virStoragePoolPtr pool = NULL;
virStorageVolPtr vol = NULL;
- char *poolxml = NULL;
virStorageVolInfo info;
int ret = -1;
VIR_AUTOPTR(virStoragePoolDef) pooldef = NULL;
+ VIR_AUTOFREE(char *) poolxml = NULL;
if (def->src->type != VIR_STORAGE_TYPE_VOLUME)
return 0;
@@ -31209,7 +30824,6 @@ virDomainDiskTranslateSourcePool(virDomainDiskDefPtr def)
virObjectUnref(conn);
virObjectUnref(pool);
virObjectUnref(vol);
- VIR_FREE(poolxml);
return ret;
}
--
2.20.1
8:07 a.m.
New subject: [libvirt] [PATCH v3 05/10] conf: Use VIR_AUTOFREE in domain_conf
On Fri, Mar 01, 2019 at 11:26:47AM -0500, John Ferlan wrote:
Let's make use of the auto __cleanup capabilities for VIR_FREE
consumers.
In some cases adding or removing blank lines for readability.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
Reviewed-by: Erik Skultety <eskultet(a)redhat.com>
---
src/conf/domain_conf.c | 1080 +++++++++++++---------------------------
1 file changed, 347 insertions(+), 733 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index cbaa32e174..c06c52271c 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
[...]
@@ -13468,8 +13263,8 @@ virDomainGraphicsAuthDefParseXML(xmlNodePtr
node,
virDomainGraphicsAuthDefPtr def,
int type)
{
- char *validTo = NULL;
- char *connected = virXMLPropString(node, "connected");
+ VIR_AUTOFREE(char *) validTo = NULL;
+ VIR_AUTOFREE(char *) connected = virXMLPropString(node, "connected");
def->passwd = virXMLPropString(node, "passwd");
@@ -13497,11 +13292,9 @@ virDomainGraphicsAuthDefParseXML(xmlNodePtr node,
virReportError(VIR_ERR_INTERNAL_ERROR,
_("cannot parse password validity time '%s',
expect YYYY-MM-DDTHH:MM:SS"),
validTo);
- VIR_FREE(validTo);
VIR_FREE(def->passwd);
return -1;
Nice, this would have leaked 'connected' before.
}
- VIR_FREE(validTo);
tm.tm_year -= 1900; /* Human epoch starts at 0 BC, not 1900BC */
tm.tm_mon--; /* Humans start months at 1, computers at 0 */
@@ -13516,10 +13309,8 @@ virDomainGraphicsAuthDefParseXML(xmlNodePtr node,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown connected value %s"),
connected);
- VIR_FREE(connected);
return -1;
}
- VIR_FREE(connected);
/* VNC supports connected='keep' only */
if (type == VIR_DOMAIN_GRAPHICS_TYPE_VNC &&
[...]
@@ -14104,25 +13872,19 @@
virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown spice channel name %s"),
name);
- VIR_FREE(name);
- VIR_FREE(mode);
goto error;
}
if ((modeval = virDomainGraphicsSpiceChannelModeTypeFromString(mode))
< 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown spice channel mode %s"),
mode);
- VIR_FREE(name);
- VIR_FREE(mode);
goto error;
}
- VIR_FREE(name);
- VIR_FREE(mode);
Nice to see these go.
def->data.spice.channels[nameval] = modeval;
} else if (virXMLNodeNameEqual(cur, "image")) {
- char *compression = virXMLPropString(cur, "compression");
int compressionVal;
+ VIR_AUTOFREE(char *) compression = virXMLPropString(cur,
"compression");
if (!compression) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
[...]
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
10:26 a.m.
New subject: [libvirt] [PATCH v3 06/10] conf: Merge with previous
Seems I missed a few more VIR_AUTOFREE capable places. Once ACK'd
I will merge with previous.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
src/conf/domain_conf.c | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index c06c52271c..da2175713d 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -22020,13 +22020,11 @@ virDomainChannelDefCheckABIStability(virDomainChrDefPtr src,
case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD:
if (memcmp(src->target.addr, dst->target.addr,
sizeof(*src->target.addr)) != 0) {
- char *saddr = virSocketAddrFormatFull(src->target.addr, true,
":");
- char *daddr = virSocketAddrFormatFull(dst->target.addr, true,
":");
+ VIR_AUTOFREE(char *) saddr = virSocketAddrFormatFull(src->target.addr,
true, ":");
+ VIR_AUTOFREE(char *) daddr = virSocketAddrFormatFull(dst->target.addr,
true, ":");
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Target channel addr %s does not match source
%s"),
NULLSTR(daddr), NULLSTR(saddr));
- VIR_FREE(saddr);
- VIR_FREE(daddr);
return false;
}
break;
@@ -25315,8 +25313,10 @@ virDomainNetDefFormat(virBufferPtr buf,
virBufferEscapeString(buf, "<model type='%s'/>\n",
def->model);
if (virDomainNetIsVirtioModel(def)) {
- char *str = NULL, *gueststr = NULL, *hoststr = NULL;
int rc = 0;
+ VIR_AUTOFREE(char *) str = NULL;
+ VIR_AUTOFREE(char *) gueststr = NULL;
+ VIR_AUTOFREE(char *) hoststr = NULL;
if (virDomainVirtioNetDriverFormat(&str, def) < 0 ||
virDomainVirtioNetGuestOptsFormat(&gueststr, def) < 0 ||
@@ -25339,9 +25339,6 @@ virDomainNetDefFormat(virBufferPtr buf,
virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</driver>\n");
}
- VIR_FREE(str);
- VIR_FREE(hoststr);
- VIR_FREE(gueststr);
if (rc < 0)
return -1;
@@ -25561,19 +25558,19 @@ virDomainChrTargetDefFormat(virBufferPtr buf,
switch (def->targetType) {
case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD: {
int port = virSocketAddrGetPort(def->target.addr);
+ VIR_AUTOFREE(char *) addr = NULL;
if (port < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Unable to format guestfwd port"));
return -1;
}
- char *addr = virSocketAddrFormat(def->target.addr);
+ addr = virSocketAddrFormat(def->target.addr);
if (addr == NULL)
return -1;
virBufferAsprintf(buf, " address='%s' port='%d'",
addr, port);
- VIR_FREE(addr);
break;
}
@@ -27147,11 +27144,10 @@ virDomainHugepagesFormatBuf(virBufferPtr buf,
hugepage->size);
if (hugepage->nodemask) {
- char *nodeset = NULL;
+ VIR_AUTOFREE(char *) nodeset = NULL;
if (!(nodeset = virBitmapFormat(hugepage->nodemask)))
goto cleanup;
virBufferAsprintf(buf, " nodeset='%s'", nodeset);
- VIR_FREE(nodeset);
}
virBufferAddLit(buf, "/>\n");
--
2.20.1
8:08 a.m.
New subject: [libvirt] [PATCH v3 06/10] conf: Merge with previous
On Fri, Mar 01, 2019 at 11:26:48AM -0500, John Ferlan wrote:
Seems I missed a few more VIR_AUTOFREE capable places. Once ACK'd
I will merge with previous.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
src/conf/domain_conf.c | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
10:26 a.m.
New subject: [libvirt] [PATCH v3 07/10] conf: Use VIR_AUTOUNREF in domain_conf
Let's make use of the auto __cleanup capabilities for virObjectUnref
consumers.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
src/conf/domain_conf.c | 24 ++++++++----------------
1 file changed, 8 insertions(+), 16 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index da2175713d..c04517dbd0 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -1587,8 +1587,8 @@ void virDomainLeaseDefFree(virDomainLeaseDefPtr def)
static virDomainVcpuDefPtr
virDomainVcpuDefNew(virDomainXMLOptionPtr xmlopt)
{
- virObjectPtr priv = NULL;
virDomainVcpuDefPtr ret = NULL;
+ VIR_AUTOUNREF(virObjectPtr) priv = NULL;
if (xmlopt && xmlopt->privateData.vcpuNew &&
!(priv = xmlopt->privateData.vcpuNew()))
@@ -1600,7 +1600,6 @@ virDomainVcpuDefNew(virDomainXMLOptionPtr xmlopt)
VIR_STEAL_PTR(ret->privateData, priv);
cleanup:
- virObjectUnref(priv);
return ret;
}
@@ -19142,13 +19141,13 @@ virDomainCachetuneDefParse(virDomainDefPtr def,
unsigned int flags)
{
xmlNodePtr oldnode = ctxt->node;
- virResctrlAllocPtr alloc = NULL;
virDomainResctrlDefPtr resctrl = NULL;
ssize_t i = 0;
int n;
int ret = -1;
VIR_AUTOPTR(virBitmap) vcpus = NULL;
VIR_AUTOFREE(xmlNodePtr *) nodes = NULL;
+ VIR_AUTOUNREF(virResctrlAllocPtr) alloc = NULL;
ctxt->node = node;
@@ -19207,7 +19206,6 @@ virDomainCachetuneDefParse(virDomainDefPtr def,
cleanup:
ctxt->node = oldnode;
virDomainResctrlDefFree(resctrl);
- virObjectUnref(alloc);
return ret;
}
@@ -19353,10 +19351,10 @@ virDomainMemorytuneDefParse(virDomainDefPtr def,
unsigned int flags)
{
xmlNodePtr oldnode = ctxt->node;
- virResctrlAllocPtr alloc = NULL;
virDomainResctrlDefPtr resctrl = NULL;
VIR_AUTOPTR(virBitmap) vcpus = NULL;
VIR_AUTOFREE(xmlNodePtr *) nodes = NULL;
+ VIR_AUTOUNREF(virResctrlAllocPtr) alloc = NULL;
ssize_t i = 0;
int n;
@@ -19414,7 +19412,6 @@ virDomainMemorytuneDefParse(virDomainDefPtr def,
cleanup:
ctxt->node = oldnode;
virDomainResctrlDefFree(resctrl);
- virObjectUnref(alloc);
return ret;
}
@@ -30460,11 +30457,11 @@ virDomainNetBandwidthUpdate(virDomainNetDefPtr iface,
int
virDomainNetResolveActualType(virDomainNetDefPtr iface)
{
- virConnectPtr conn = NULL;
- virNetworkPtr net = NULL;
virNetworkDefPtr def = NULL;
int ret = -1;
VIR_AUTOFREE(char *) xml = NULL;
+ VIR_AUTOUNREF(virConnectPtr) conn = NULL;
+ VIR_AUTOUNREF(virNetworkPtr) net = NULL;
if (iface->type != VIR_DOMAIN_NET_TYPE_NETWORK)
return iface->type;
@@ -30531,8 +30528,6 @@ virDomainNetResolveActualType(virDomainNetDefPtr iface)
cleanup:
virNetworkDefFree(def);
- virObjectUnref(conn);
- virObjectUnref(net);
return ret;
}
@@ -30656,13 +30651,13 @@ virDomainDiskTranslateISCSIDirect(virDomainDiskDefPtr def,
int
virDomainDiskTranslateSourcePool(virDomainDiskDefPtr def)
{
- virConnectPtr conn = NULL;
- virStoragePoolPtr pool = NULL;
- virStorageVolPtr vol = NULL;
virStorageVolInfo info;
int ret = -1;
VIR_AUTOPTR(virStoragePoolDef) pooldef = 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)
return 0;
@@ -30817,9 +30812,6 @@ virDomainDiskTranslateSourcePool(virDomainDiskDefPtr def)
ret = 0;
cleanup:
- virObjectUnref(conn);
- virObjectUnref(pool);
- virObjectUnref(vol);
return ret;
}
--
2.20.1
8:11 a.m.
New subject: [libvirt] [PATCH v3 07/10] conf: Use VIR_AUTOUNREF in domain_conf
On Fri, Mar 01, 2019 at 11:26:49AM -0500, John Ferlan wrote:
Let's make use of the auto __cleanup capabilities for
virObjectUnref
consumers.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
src/conf/domain_conf.c | 24 ++++++++----------------
1 file changed, 8 insertions(+), 16 deletions(-)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
10:26 a.m.
New subject: [libvirt] [PATCH v3 08/10] conf: Clean up some unnecessary goto paths
Now that we're using VIR_AUTOFREE there's quite a bit of clean up
possible for now unnecessary goto paths.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
Reviewed-by: Erik Skultety <eskultet(a)redhat.com>
---
src/conf/domain_conf.c | 801 ++++++++++++++++-------------------------
1 file changed, 310 insertions(+), 491 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index c04517dbd0..5495276e78 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -1107,32 +1107,31 @@ virDomainKeyWrapCipherDefParseXML(virDomainKeyWrapDefPtr keywrap,
{
int state_type;
int name_type;
- int ret = -1;
VIR_AUTOFREE(char *) name = NULL;
VIR_AUTOFREE(char *) state = NULL;
if (!(name = virXMLPropString(node, "name"))) {
virReportError(VIR_ERR_CONF_SYNTAX, "%s",
_("missing name for cipher"));
- goto cleanup;
+ return -1;
}
if ((name_type = virDomainKeyWrapCipherNameTypeFromString(name)) < 0) {
virReportError(VIR_ERR_CONF_SYNTAX,
_("%s is not a supported cipher name"), name);
- goto cleanup;
+ return -1;
}
if (!(state = virXMLPropString(node, "state"))) {
virReportError(VIR_ERR_CONF_SYNTAX,
_("missing state for cipher named %s"), name);
- goto cleanup;
+ return -1;
}
if ((state_type = virTristateSwitchTypeFromString(state)) < 0) {
virReportError(VIR_ERR_CONF_SYNTAX,
_("%s is not a supported cipher state"), state);
- goto cleanup;
+ return -1;
}
switch ((virDomainKeyWrapCipherName) name_type) {
@@ -1143,7 +1142,7 @@ virDomainKeyWrapCipherDefParseXML(virDomainKeyWrapDefPtr keywrap,
"one cipher node with name %s"),
virDomainKeyWrapCipherNameTypeToString(name_type));
- goto cleanup;
+ return -1;
}
keywrap->aes = state_type;
break;
@@ -1155,7 +1154,7 @@ virDomainKeyWrapCipherDefParseXML(virDomainKeyWrapDefPtr keywrap,
"one cipher node with name %s"),
virDomainKeyWrapCipherNameTypeToString(name_type));
- goto cleanup;
+ return -1;
}
keywrap->dea = state_type;
break;
@@ -1164,10 +1163,7 @@ virDomainKeyWrapCipherDefParseXML(virDomainKeyWrapDefPtr keywrap,
break;
}
- ret = 0;
-
- cleanup:
- return ret;
+ return 0;
}
static int
@@ -1270,7 +1266,6 @@ static int
virDomainVirtioOptionsParseXML(xmlNodePtr driver,
virDomainVirtioOptionsPtr *virtio)
{
- int ret = -1;
int val;
virDomainVirtioOptionsPtr res;
VIR_AUTOFREE(char *) str = NULL;
@@ -1287,7 +1282,7 @@ virDomainVirtioOptionsParseXML(xmlNodePtr driver,
if ((val = virTristateSwitchTypeFromString(str)) <= 0) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("invalid iommu value"));
- goto cleanup;
+ return -1;
}
res->iommu = val;
}
@@ -1297,15 +1292,12 @@ virDomainVirtioOptionsParseXML(xmlNodePtr driver,
if ((val = virTristateSwitchTypeFromString(str)) <= 0) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("invalid ats value"));
- goto cleanup;
+ return -1;
}
res->ats = val;
}
- ret = 0;
-
- cleanup:
- return ret;
+ return 0;
}
@@ -5331,7 +5323,6 @@ virDomainDefCollectBootOrder(virDomainDefPtr def ATTRIBUTE_UNUSED,
void *data)
{
virHashTablePtr bootHash = data;
- int ret = -1;
VIR_AUTOFREE(char *) order = NULL;
if (info->bootIndex == 0)
@@ -5346,22 +5337,19 @@ virDomainDefCollectBootOrder(virDomainDefPtr def
ATTRIBUTE_UNUSED,
return 0;
}
if (virAsprintf(&order, "%u", info->bootIndex) < 0)
- goto cleanup;
+ return -1;
if (virHashLookup(bootHash, order)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("boot order '%s' used for more than one
device"),
order);
- goto cleanup;
+ return -1;
}
if (virHashAddEntry(bootHash, order, (void *) 1) < 0)
- goto cleanup;
-
- ret = 0;
+ return -1;
- cleanup:
- return ret;
+ return 0;
}
@@ -6881,7 +6869,6 @@ static int
virDomainDeviceUSBMasterParseXML(xmlNodePtr node,
virDomainDeviceUSBMasterPtr master)
{
- int ret = -1;
VIR_AUTOFREE(char *) startport = NULL;
memset(master, 0, sizeof(*master));
@@ -6892,27 +6879,23 @@ virDomainDeviceUSBMasterParseXML(xmlNodePtr node,
virStrToLong_ui(startport, NULL, 10, &master->startport) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Cannot parse <master> 'startport'
attribute"));
- goto cleanup;
+ return -1;
}
- ret = 0;
-
- cleanup:
- return ret;
+ return 0;
}
static int
virDomainDeviceBootParseXML(xmlNodePtr node,
virDomainDeviceInfoPtr info)
{
- int ret = -1;
VIR_AUTOFREE(char *) order = NULL;
VIR_AUTOFREE(char *) loadparm = NULL;
if (!(order = virXMLPropString(node, "order"))) {
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("missing boot order attribute"));
- goto cleanup;
+ return -1;
}
if (virStrToLong_uip(order, NULL, 10, &info->bootIndex) < 0 ||
@@ -6920,7 +6903,7 @@ virDomainDeviceBootParseXML(xmlNodePtr node,
virReportError(VIR_ERR_INTERNAL_ERROR,
_("incorrect boot order '%s', expecting positive
integer"),
order);
- goto cleanup;
+ return -1;
}
loadparm = virXMLPropString(node, "loadparm");
@@ -6929,26 +6912,22 @@ virDomainDeviceBootParseXML(xmlNodePtr node,
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Failed to convert loadparm '%s' to upper
case"),
loadparm);
- goto cleanup;
+ return -1;
}
if (!virDomainDeviceLoadparmIsValid(info->loadparm)) {
VIR_FREE(info->loadparm);
- goto cleanup;
+ return -1;
}
}
- ret = 0;
-
- cleanup:
- return ret;
+ return 0;
}
static int
virDomainDeviceISAAddressParseXML(xmlNodePtr node,
virDomainDeviceISAAddressPtr addr)
{
- int ret = -1;
VIR_AUTOFREE(char *) iobase = NULL;
VIR_AUTOFREE(char *) irq = NULL;
@@ -6961,19 +6940,17 @@ virDomainDeviceISAAddressParseXML(xmlNodePtr node,
virStrToLong_uip(iobase, NULL, 16, &addr->iobase) < 0) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("Cannot parse <address> 'iobase'
attribute"));
- goto cleanup;
+ return -1;
}
if (irq &&
virStrToLong_uip(irq, NULL, 16, &addr->irq) < 0) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("Cannot parse <address> 'irq'
attribute"));
- goto cleanup;
+ return -1;
}
- ret = 0;
- cleanup:
- return ret;
+ return 0;
}
@@ -6981,7 +6958,6 @@ static int
virDomainDeviceDimmAddressParseXML(xmlNodePtr node,
virDomainDeviceDimmAddressPtr addr)
{
- int ret = -1;
VIR_AUTOFREE(char *) tmp = NULL;
if (!(tmp = virXMLPropString(node, "slot")) ||
@@ -6989,7 +6965,7 @@ virDomainDeviceDimmAddressParseXML(xmlNodePtr node,
virReportError(VIR_ERR_XML_ERROR,
_("invalid or missing dimm slot id '%s'"),
NULLSTR(tmp));
- goto cleanup;
+ return -1;
}
VIR_FREE(tmp);
@@ -6997,14 +6973,11 @@ virDomainDeviceDimmAddressParseXML(xmlNodePtr node,
if (virStrToLong_ullp(tmp, NULL, 16, &addr->base) < 0) {
virReportError(VIR_ERR_XML_ERROR,
_("invalid dimm base address '%s'"), tmp);
- goto cleanup;
+ return -1;
}
}
- ret = 0;
-
- cleanup:
- return ret;
+ return 0;
}
@@ -7012,57 +6985,56 @@ static int
virDomainDeviceAddressParseXML(xmlNodePtr address,
virDomainDeviceInfoPtr info)
{
- int ret = -1;
VIR_AUTOFREE(char *) type = virXMLPropString(address, "type");
if (type) {
if ((info->type = virDomainDeviceAddressTypeFromString(type)) <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown address type '%s'"), type);
- goto cleanup;
+ return -1;
}
} else {
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("No type specified for device
address"));
- goto cleanup;
+ return -1;
}
switch ((virDomainDeviceAddressType) info->type) {
case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI:
if (virPCIDeviceAddressParseXML(address, &info->addr.pci) < 0)
- goto cleanup;
+ return -1;
break;
case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE:
if (virDomainDeviceDriveAddressParseXML(address, &info->addr.drive) <
0)
- goto cleanup;
+ return -1;
break;
case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL:
if (virDomainDeviceVirtioSerialAddressParseXML
(address, &info->addr.vioserial) < 0)
- goto cleanup;
+ return -1;
break;
case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCID:
if (virDomainDeviceCcidAddressParseXML(address, &info->addr.ccid) < 0)
- goto cleanup;
+ return -1;
break;
case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB:
if (virDomainDeviceUSBAddressParseXML(address, &info->addr.usb) < 0)
- goto cleanup;
+ return -1;
break;
case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO:
if (virDomainDeviceSpaprVioAddressParseXML(address, &info->addr.spaprvio)
< 0)
- goto cleanup;
+ return -1;
break;
case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW:
if (virDomainDeviceCCWAddressParseXML
(address, &info->addr.ccw) < 0)
- goto cleanup;
+ return -1;
break;
case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO:
@@ -7070,17 +7042,17 @@ virDomainDeviceAddressParseXML(xmlNodePtr address,
case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_ISA:
if (virDomainDeviceISAAddressParseXML(address, &info->addr.isa) < 0)
- goto cleanup;
+ return -1;
break;
case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390:
virReportError(VIR_ERR_XML_ERROR, "%s",
_("virtio-s390 bus doesn't have an address"));
- goto cleanup;
+ return -1;
case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DIMM:
if (virDomainDeviceDimmAddressParseXML(address, &info->addr.dimm) < 0)
- goto cleanup;
+ return -1;
break;
case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE:
@@ -7088,9 +7060,7 @@ virDomainDeviceAddressParseXML(xmlNodePtr address,
break;
}
- ret = 0;
- cleanup:
- return ret;
+ return 0;
}
@@ -7532,7 +7502,6 @@ static int
virDomainHostdevSubsysSCSIHostDefParseXML(xmlNodePtr sourcenode,
virDomainHostdevSubsysSCSIPtr scsisrc)
{
- int ret = -1;
bool got_address = false, got_adapter = false;
xmlNodePtr cur;
virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host;
@@ -7548,7 +7517,7 @@ virDomainHostdevSubsysSCSIHostDefParseXML(xmlNodePtr sourcenode,
virReportError(VIR_ERR_XML_ERROR, "%s",
_("more than one source addresses is "
"specified for scsi hostdev"));
- goto cleanup;
+ return -1;
}
if (!(bus = virXMLPropString(cur, "bus")) ||
@@ -7557,26 +7526,26 @@ virDomainHostdevSubsysSCSIHostDefParseXML(xmlNodePtr sourcenode,
virReportError(VIR_ERR_XML_ERROR, "%s",
_("'bus', 'target', and
'unit' must be specified "
"for scsi hostdev source address"));
- goto cleanup;
+ return -1;
}
if (virStrToLong_uip(bus, NULL, 0, &scsihostsrc->bus) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("cannot parse bus '%s'"), bus);
- goto cleanup;
+ return -1;
}
if (virStrToLong_uip(target, NULL, 0,
&scsihostsrc->target) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("cannot parse target '%s'"),
target);
- goto cleanup;
+ return -1;
}
if (virStrToLong_ullp(unit, NULL, 0, &scsihostsrc->unit) < 0)
{
virReportError(VIR_ERR_INTERNAL_ERROR,
_("cannot parse unit '%s'"), unit);
- goto cleanup;
+ return -1;
}
got_address = true;
@@ -7585,12 +7554,12 @@ virDomainHostdevSubsysSCSIHostDefParseXML(xmlNodePtr sourcenode,
virReportError(VIR_ERR_XML_ERROR, "%s",
_("more than one adapters is specified "
"for scsi hostdev source"));
- goto cleanup;
+ return -1;
}
if (!(scsihostsrc->adapter = virXMLPropString(cur, "name")))
{
virReportError(VIR_ERR_XML_ERROR, "%s",
_("'adapter' must be specified for scsi
hostdev source"));
- goto cleanup;
+ return -1;
}
got_adapter = true;
@@ -7598,7 +7567,7 @@ virDomainHostdevSubsysSCSIHostDefParseXML(xmlNodePtr sourcenode,
virReportError(VIR_ERR_XML_ERROR,
_("unsupported element '%s' of scsi hostdev
source"),
cur->name);
- goto cleanup;
+ return -1;
}
}
cur = cur->next;
@@ -7608,12 +7577,10 @@ virDomainHostdevSubsysSCSIHostDefParseXML(xmlNodePtr sourcenode,
virReportError(VIR_ERR_XML_ERROR, "%s",
_("'adapter' and 'address' must be specified
for scsi "
"hostdev source"));
- goto cleanup;
+ return -1;
}
- ret = 0;
- cleanup:
- return ret;
+ return 0;
}
static int
@@ -7692,7 +7659,6 @@ virDomainHostdevSubsysSCSIDefParseXML(xmlNodePtr sourcenode,
virDomainHostdevSubsysSCSIPtr scsisrc,
xmlXPathContextPtr ctxt)
{
- int ret = -1;
VIR_AUTOFREE(char *) protocol = NULL;
if ((protocol = virXMLPropString(sourcenode, "protocol"))) {
@@ -7702,17 +7668,14 @@ virDomainHostdevSubsysSCSIDefParseXML(xmlNodePtr sourcenode,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Unknown SCSI subsystem protocol '%s'"),
protocol);
- goto cleanup;
+ return -1;
}
}
if (scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI)
- ret = virDomainHostdevSubsysSCSIiSCSIDefParseXML(sourcenode, scsisrc, ctxt);
- else
- ret = virDomainHostdevSubsysSCSIHostDefParseXML(sourcenode, scsisrc);
+ return virDomainHostdevSubsysSCSIiSCSIDefParseXML(sourcenode, scsisrc, ctxt);
- cleanup:
- return ret;
+ return virDomainHostdevSubsysSCSIHostDefParseXML(sourcenode, scsisrc);
}
static int
@@ -7720,14 +7683,13 @@ virDomainHostdevSubsysSCSIVHostDefParseXML(xmlNodePtr sourcenode,
virDomainHostdevDefPtr def)
{
virDomainHostdevSubsysSCSIVHostPtr hostsrc = &def->source.subsys.u.scsi_host;
- int ret = -1;
VIR_AUTOFREE(char *) protocol = NULL;
VIR_AUTOFREE(char *) wwpn = NULL;
if (!(protocol = virXMLPropString(sourcenode, "protocol"))) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("Missing scsi_host subsystem protocol"));
- return ret;
+ return -1;
}
if ((hostsrc->protocol =
@@ -7735,7 +7697,7 @@ virDomainHostdevSubsysSCSIVHostDefParseXML(xmlNodePtr sourcenode,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Unknown scsi_host subsystem protocol '%s'"),
protocol);
- goto cleanup;
+ return -1;
}
switch ((virDomainHostdevSubsysSCSIHostProtocolType) hostsrc->protocol) {
@@ -7743,13 +7705,13 @@ virDomainHostdevSubsysSCSIVHostDefParseXML(xmlNodePtr sourcenode,
if (!(wwpn = virXMLPropString(sourcenode, "wwpn"))) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("missing vhost-scsi hostdev source wwpn"));
- goto cleanup;
+ return -1;
}
if (!STRPREFIX(wwpn, "naa.") ||
!virValidateWWN(wwpn + 4)) {
virReportError(VIR_ERR_XML_ERROR, "%s", _("malformed
'wwpn' value"));
- goto cleanup;
+ return -1;
}
VIR_STEAL_PTR(hostsrc->wwpn, wwpn);
break;
@@ -7758,20 +7720,17 @@ virDomainHostdevSubsysSCSIVHostDefParseXML(xmlNodePtr sourcenode,
virReportError(VIR_ERR_XML_ERROR,
_("Invalid hostdev protocol '%s'"),
virDomainHostdevSubsysSCSIHostProtocolTypeToString(hostsrc->protocol));
- goto cleanup;
+ return -1;
break;
}
- ret = 0;
- cleanup:
- return ret;
+ return 0;
}
static int
virDomainHostdevSubsysMediatedDevDefParseXML(virDomainHostdevDefPtr def,
xmlXPathContextPtr ctxt)
{
- int ret = -1;
unsigned char uuid[VIR_UUID_BUFLEN] = {0};
xmlNodePtr node = NULL;
virDomainHostdevSubsysMediatedDevPtr mdevsrc = &def->source.subsys.u.mdev;
@@ -7780,26 +7739,24 @@
virDomainHostdevSubsysMediatedDevDefParseXML(virDomainHostdevDefPtr def,
if (!(node = virXPathNode("./source/address", ctxt))) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Missing <address> element"));
- goto cleanup;
+ return -1;
}
if (!(uuidxml = virXMLPropString(node, "uuid"))) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Missing 'uuid' attribute for element
<address>"));
- goto cleanup;
+ return -1;
}
if (virUUIDParse(uuidxml, uuid) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s",
_("Cannot parse uuid attribute of element
<address>"));
- goto cleanup;
+ return -1;
}
virUUIDFormat(uuid, mdevsrc->uuidstr);
- ret = 0;
- cleanup:
- return ret;
+ return 0;
}
static int
@@ -7811,7 +7768,6 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
{
xmlNodePtr sourcenode;
int backend;
- int ret = -1;
virDomainHostdevSubsysPCIPtr pcisrc = &def->source.subsys.u.pci;
virDomainHostdevSubsysSCSIPtr scsisrc = &def->source.subsys.u.scsi;
virDomainHostdevSubsysMediatedDevPtr mdevsrc = &def->source.subsys.u.mdev;
@@ -7851,18 +7807,18 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown host device source address type
'%s'"),
type);
- goto cleanup;
+ return -1;
}
} else {
virReportError(VIR_ERR_XML_ERROR,
"%s", _("missing source address type"));
- goto cleanup;
+ return -1;
}
if (!(sourcenode = virXPathNode("./source", ctxt))) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("Missing <source> element in hostdev device"));
- goto cleanup;
+ return -1;
}
if (def->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB &&
@@ -7870,20 +7826,20 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Setting startupPolicy is only allowed for USB"
" devices"));
- goto cleanup;
+ return -1;
}
if (sgio) {
if (def->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("sgio is only supported for scsi host device"));
- goto cleanup;
+ return -1;
}
if ((scsisrc->sgio = virDomainDeviceSGIOTypeFromString(sgio)) <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown sgio mode '%s'"), sgio);
- goto cleanup;
+ return -1;
}
}
@@ -7891,14 +7847,14 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
if (def->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("rawio is only supported for scsi host device"));
- goto cleanup;
+ return -1;
}
if ((scsisrc->rawio = virTristateBoolTypeFromString(rawio)) <= 0) {
virReportError(VIR_ERR_XML_ERROR,
_("unknown hostdev rawio setting '%s'"),
rawio);
- goto cleanup;
+ return -1;
}
}
@@ -7907,21 +7863,21 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
virReportError(VIR_ERR_XML_ERROR, "%s",
_("'model' attribute in <hostdev> is only
supported "
"when type='mdev'"));
- goto cleanup;
+ return -1;
}
} else {
if (!model) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("Missing 'model' attribute in mediated
device's "
"<hostdev> element"));
- goto cleanup;
+ return -1;
}
if ((mdevsrc->model = virMediatedDeviceModelTypeFromString(model)) < 0) {
virReportError(VIR_ERR_XML_ERROR,
_("unknown hostdev model '%s'"),
model);
- goto cleanup;
+ return -1;
}
if (display &&
@@ -7930,14 +7886,14 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
_("unknown value '%s' for <hostdev>
attribute "
"'display'"),
display);
- goto cleanup;
+ return -1;
}
}
switch (def->source.subsys.type) {
case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI:
if (virDomainHostdevSubsysPCIDefParseXML(sourcenode, def, flags) < 0)
- goto cleanup;
+ return -1;
backend = VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT;
if ((backendStr = virXPathString("string(./driver/@name)", ctxt))
&&
@@ -7946,7 +7902,7 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Unknown PCI device <driver name='%s'/>
"
"has been specified"), backendStr);
- goto cleanup;
+ return -1;
}
pcisrc->backend = backend;
@@ -7954,33 +7910,31 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB:
if (virDomainHostdevSubsysUSBDefParseXML(sourcenode, def) < 0)
- goto cleanup;
+ return -1;
break;
case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI:
if (virDomainHostdevSubsysSCSIDefParseXML(sourcenode, scsisrc, ctxt) < 0)
- goto cleanup;
+ return -1;
break;
case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST:
if (virDomainHostdevSubsysSCSIVHostDefParseXML(sourcenode, def) < 0)
- goto cleanup;
+ return -1;
break;
case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV:
if (virDomainHostdevSubsysMediatedDevDefParseXML(def, ctxt) < 0)
- goto cleanup;
+ return -1;
break;
default:
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("address type='%s' not supported in hostdev
interfaces"),
virDomainHostdevSubsysTypeToString(def->source.subsys.type));
- goto cleanup;
+ return -1;
}
- ret = 0;
- cleanup:
- return ret;
+ return 0;
}
static virNetDevIPAddrPtr
@@ -7999,7 +7953,7 @@ virDomainNetIPParseXML(xmlNodePtr node)
if (!(address = virXMLPropString(node, "address"))) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("Missing required address in <ip>"));
- goto cleanup;
+ return NULL;
}
familyStr = virXMLPropString(node, "family");
@@ -8011,13 +7965,13 @@ virDomainNetIPParseXML(xmlNodePtr node)
family = virSocketAddrNumericFamily(address);
if (VIR_ALLOC(ip) < 0)
- goto cleanup;
+ return NULL;
if (virSocketAddrParse(&ip->address, address, family) < 0) {
virReportError(VIR_ERR_XML_ERROR,
_("Invalid address '%s' in <ip>"),
address);
- goto cleanup;
+ return NULL;
}
prefixStr = virXMLPropString(node, "prefix");
@@ -8028,7 +7982,7 @@ virDomainNetIPParseXML(xmlNodePtr node)
virReportError(VIR_ERR_XML_ERROR,
_("Invalid prefix value '%s' in <ip>"),
prefixStr);
- goto cleanup;
+ return NULL;
}
ip->prefix = prefixValue;
@@ -8036,12 +7990,10 @@ virDomainNetIPParseXML(xmlNodePtr node)
virSocketAddrParse(&ip->peer, peer, family) < 0) {
virReportError(VIR_ERR_INVALID_ARG,
_("Invalid peer '%s' in <ip>"), peer);
- goto cleanup;
+ return NULL;
}
VIR_STEAL_PTR(ret, ip);
-
- cleanup:
return ret;
}
@@ -8840,7 +8792,6 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node,
unsigned int flags)
{
int tlsCfgVal;
- int ret = -1;
VIR_AUTOFREE(char *) protocol = NULL;
VIR_AUTOFREE(char *) haveTLS = NULL;
VIR_AUTOFREE(char *) tlsCfg = NULL;
@@ -8848,27 +8799,27 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node,
if (!(protocol = virXMLPropString(node, "protocol"))) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("missing network source protocol type"));
- goto cleanup;
+ return -1;
}
if ((src->protocol = virStorageNetProtocolTypeFromString(protocol)) <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown protocol type '%s'"), protocol);
- goto cleanup;
+ return -1;
}
if (!(src->path = virXMLPropString(node, "name")) &&
src->protocol != VIR_STORAGE_NET_PROTOCOL_NBD) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("missing name for disk source"));
- goto cleanup;
+ return -1;
}
if ((haveTLS = virXMLPropString(node, "tls")) &&
(src->haveTLS = virTristateBoolTypeFromString(haveTLS)) <= 0) {
virReportError(VIR_ERR_XML_ERROR,
_("unknown disk source 'tls' setting '%s'"),
haveTLS);
- goto cleanup;
+ return -1;
}
if ((flags & VIR_DOMAIN_DEF_PARSE_STATUS) &&
@@ -8877,7 +8828,7 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node,
virReportError(VIR_ERR_XML_ERROR,
_("Invalid tlsFromConfig value: %s"),
tlsCfg);
- goto cleanup;
+ return -1;
}
src->tlsFromConfig = !!tlsCfgVal;
}
@@ -8893,13 +8844,13 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node,
virReportError(VIR_ERR_XML_ERROR,
_("can't split path '%s' into pool name and
image "
"name"), src->path);
- goto cleanup;
+ return -1;
}
src->volume = src->path;
if (VIR_STRDUP(src->path, tmp + 1) < 0)
- goto cleanup;
+ return -1;
tmp[0] = '\0';
}
@@ -8911,16 +8862,13 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node,
src->configFile = virXPathString("string(./config/@file)", ctxt);
if (virDomainStorageNetworkParseHosts(node, &src->hosts, &src->nhosts)
< 0)
- goto cleanup;
+ return -1;
virStorageSourceNetworkAssignDefaultPorts(src);
virStorageSourceInitiatorParseXML(ctxt, &src->initiator);
- ret = 0;
-
- cleanup:
- return ret;
+ return 0;
}
@@ -9234,20 +9182,19 @@ virDomainDiskDefMirrorParse(virDomainDiskDefPtr def,
virDomainXMLOptionPtr xmlopt)
{
xmlNodePtr mirrorNode;
- int ret = -1;
VIR_AUTOFREE(char *) mirrorFormat = NULL;
VIR_AUTOFREE(char *) mirrorType = NULL;
VIR_AUTOFREE(char *) ready = NULL;
VIR_AUTOFREE(char *) blockJob = NULL;
if (!(def->mirror = virStorageSourceNew()))
- goto cleanup;
+ return -1;
if ((blockJob = virXMLPropString(cur, "job"))) {
if ((def->mirrorJob = virDomainBlockJobTypeFromString(blockJob)) <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown mirror job type '%s'"),
blockJob);
- goto cleanup;
+ return -1;
}
} else {
def->mirrorJob = VIR_DOMAIN_BLOCK_JOB_TYPE_COPY;
@@ -9258,7 +9205,7 @@ virDomainDiskDefMirrorParse(virDomainDiskDefPtr def,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown mirror backing store type
'%s'"),
mirrorType);
- goto cleanup;
+ return -1;
}
mirrorFormat = virXPathString("string(./mirror/format/@type)", ctxt);
@@ -9266,12 +9213,12 @@ virDomainDiskDefMirrorParse(virDomainDiskDefPtr def,
if (!(mirrorNode = virXPathNode("./mirror/source", ctxt))) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("mirror requires source element"));
- goto cleanup;
+ return -1;
}
if (virDomainDiskSourceParse(mirrorNode, ctxt, def->mirror,
flags, xmlopt) < 0)
- goto cleanup;
+ return -1;
} else {
/* For back-compat reasons, we handle a file name
* encoded as attributes, even though we prefer
@@ -9281,13 +9228,13 @@ virDomainDiskDefMirrorParse(virDomainDiskDefPtr def,
if (!def->mirror->path) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("mirror requires file name"));
- goto cleanup;
+ return -1;
}
if (def->mirrorJob != VIR_DOMAIN_BLOCK_JOB_TYPE_COPY) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("mirror without type only supported "
"by copy job"));
- goto cleanup;
+ return -1;
}
mirrorFormat = virXMLPropString(cur, "format");
}
@@ -9297,7 +9244,7 @@ virDomainDiskDefMirrorParse(virDomainDiskDefPtr def,
if (def->mirror->format <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown mirror format value '%s'"),
mirrorFormat);
- goto cleanup;
+ return -1;
}
}
@@ -9305,13 +9252,10 @@ virDomainDiskDefMirrorParse(virDomainDiskDefPtr def,
(def->mirrorState = virDomainDiskMirrorStateTypeFromString(ready)) < 0) {
virReportError(VIR_ERR_XML_ERROR,
_("unknown mirror ready state %s"), ready);
- goto cleanup;
+ return -1;
}
- ret = 0;
-
- cleanup:
- return ret;
+ return 0;
}
@@ -9325,7 +9269,7 @@ virDomainDiskDefGeometryParse(virDomainDiskDefPtr def,
if (virStrToLong_ui(tmp, NULL, 10, &def->geometry.cylinders) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("invalid geometry settings (cyls)"));
- goto error;
+ return -1;
}
VIR_FREE(tmp);
}
@@ -9334,7 +9278,7 @@ virDomainDiskDefGeometryParse(virDomainDiskDefPtr def,
if (virStrToLong_ui(tmp, NULL, 10, &def->geometry.heads) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("invalid geometry settings (heads)"));
- goto error;
+ return -1;
}
VIR_FREE(tmp);
}
@@ -9343,7 +9287,7 @@ virDomainDiskDefGeometryParse(virDomainDiskDefPtr def,
if (virStrToLong_ui(tmp, NULL, 10, &def->geometry.sectors) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("invalid geometry settings (secs)"));
- goto error;
+ return -1;
}
VIR_FREE(tmp);
}
@@ -9354,14 +9298,11 @@ virDomainDiskDefGeometryParse(virDomainDiskDefPtr def,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("invalid translation value '%s'"),
tmp);
- goto error;
+ return -1;
}
}
return 0;
-
- error:
- return -1;
}
@@ -9505,7 +9446,6 @@ static int
virDomainDiskDefDriverParseXML(virDomainDiskDefPtr def,
xmlNodePtr cur)
{
- int ret = -1;
VIR_AUTOFREE(char *) tmp = NULL;
def->driverName = virXMLPropString(cur, "name");
@@ -9514,7 +9454,7 @@ virDomainDiskDefDriverParseXML(virDomainDiskDefPtr def,
(def->cachemode = virDomainDiskCacheTypeFromString(tmp)) < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown disk cache mode '%s'"), tmp);
- goto cleanup;
+ return -1;
}
VIR_FREE(tmp);
@@ -9522,7 +9462,7 @@ virDomainDiskDefDriverParseXML(virDomainDiskDefPtr def,
(def->error_policy = virDomainDiskErrorPolicyTypeFromString(tmp)) <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown disk error policy '%s'"), tmp);
- goto cleanup;
+ return -1;
}
VIR_FREE(tmp);
@@ -9531,7 +9471,7 @@ virDomainDiskDefDriverParseXML(virDomainDiskDefPtr def,
(def->rerror_policy == VIR_DOMAIN_DISK_ERROR_POLICY_ENOSPACE))) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown disk read error policy '%s'"), tmp);
- goto cleanup;
+ return -1;
}
VIR_FREE(tmp);
@@ -9539,7 +9479,7 @@ virDomainDiskDefDriverParseXML(virDomainDiskDefPtr def,
(def->iomode = virDomainDiskIoTypeFromString(tmp)) <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown disk io mode '%s'"), tmp);
- goto cleanup;
+ return -1;
}
VIR_FREE(tmp);
@@ -9547,7 +9487,7 @@ virDomainDiskDefDriverParseXML(virDomainDiskDefPtr def,
(def->ioeventfd = virTristateSwitchTypeFromString(tmp)) <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown disk ioeventfd mode '%s'"), tmp);
- goto cleanup;
+ return -1;
}
VIR_FREE(tmp);
@@ -9555,7 +9495,7 @@ virDomainDiskDefDriverParseXML(virDomainDiskDefPtr def,
(def->event_idx = virTristateSwitchTypeFromString(tmp)) <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown disk event_idx mode '%s'"), tmp);
- goto cleanup;
+ return -1;
}
VIR_FREE(tmp);
@@ -9563,7 +9503,7 @@ virDomainDiskDefDriverParseXML(virDomainDiskDefPtr def,
(def->copy_on_read = virTristateSwitchTypeFromString(tmp)) <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown disk copy_on_read mode '%s'"), tmp);
- goto cleanup;
+ return -1;
}
VIR_FREE(tmp);
@@ -9571,7 +9511,7 @@ virDomainDiskDefDriverParseXML(virDomainDiskDefPtr def,
(def->discard = virDomainDiskDiscardTypeFromString(tmp)) <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown disk discard mode '%s'"), tmp);
- goto cleanup;
+ return -1;
}
VIR_FREE(tmp);
@@ -9581,7 +9521,7 @@ virDomainDiskDefDriverParseXML(virDomainDiskDefPtr def,
virReportError(VIR_ERR_XML_ERROR,
_("Invalid iothread attribute in disk driver element:
%s"),
tmp);
- goto cleanup;
+ return -1;
}
VIR_FREE(tmp);
@@ -9593,7 +9533,7 @@ virDomainDiskDefDriverParseXML(virDomainDiskDefPtr def,
if ((def->src->format = virStorageFileFormatTypeFromString(tmp)) <=
0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown driver format value '%s'"),
tmp);
- goto cleanup;
+ return -1;
}
}
@@ -9604,7 +9544,7 @@ virDomainDiskDefDriverParseXML(virDomainDiskDefPtr def,
(def->detect_zeroes = virDomainDiskDetectZeroesTypeFromString(tmp)) <= 0)
{
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown driver detect_zeroes value '%s'"),
tmp);
- goto cleanup;
+ return -1;
}
VIR_FREE(tmp);
@@ -9613,13 +9553,10 @@ virDomainDiskDefDriverParseXML(virDomainDiskDefPtr def,
virReportError(VIR_ERR_XML_ERROR,
_("'queues' attribute must be positive number:
%s"),
tmp);
- goto cleanup;
+ return -1;
}
- ret = 0;
-
- cleanup:
- return ret;
+ return 0;
}
@@ -10115,7 +10052,6 @@ virDomainParseScaledValue(const char *xpath,
unsigned long long max,
bool required)
{
- int ret = -1;
unsigned long long bytes;
VIR_AUTOFREE(char *) xpath_full = NULL;
VIR_AUTOFREE(char *) unit = NULL;
@@ -10123,18 +10059,16 @@ virDomainParseScaledValue(const char *xpath,
*val = 0;
if (virAsprintf(&xpath_full, "string(%s)", xpath) < 0)
- goto cleanup;
+ return -1;
bytes_str = virXPathString(xpath_full, ctxt);
if (!bytes_str) {
- if (!required) {
- ret = 0;
- } else {
- virReportError(VIR_ERR_XML_ERROR,
- _("missing element or attribute '%s'"),
- xpath);
- }
- goto cleanup;
+ if (!required)
+ return 0;
+ virReportError(VIR_ERR_XML_ERROR,
+ _("missing element or attribute '%s'"),
+ xpath);
+ return -1;
}
VIR_FREE(xpath_full);
@@ -10142,23 +10076,21 @@ virDomainParseScaledValue(const char *xpath,
virReportError(VIR_ERR_XML_ERROR,
_("Invalid value '%s' for element or attribute
'%s'"),
bytes_str, xpath);
- goto cleanup;
+ return -1;
}
if ((units_xpath &&
virAsprintf(&xpath_full, "string(%s)", units_xpath) < 0) ||
(!units_xpath &&
virAsprintf(&xpath_full, "string(%s/@unit)", xpath) < 0))
- goto cleanup;
+ return -1;
unit = virXPathString(xpath_full, ctxt);
if (virScaleInteger(&bytes, unit, scale, max) < 0)
- goto cleanup;
+ return -1;
*val = bytes;
- ret = 1;
- cleanup:
- return ret;
+ return 1;
}
@@ -12032,7 +11964,6 @@ virDomainChrDefParseTargetXML(virDomainChrDefPtr def,
xmlNodePtr cur,
unsigned int flags)
{
- int ret = -1;
xmlNodePtr child;
unsigned int port;
VIR_AUTOFREE(char *) targetType = virXMLPropString(cur, "type");
@@ -12047,7 +11978,7 @@ virDomainChrDefParseTargetXML(virDomainChrDefPtr def,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown target type '%s' specified for character
device"),
targetType);
- goto error;
+ return -1;
}
child = cur->children;
@@ -12065,7 +11996,7 @@ virDomainChrDefParseTargetXML(virDomainChrDefPtr def,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown target model '%s' specified for character
device"),
targetModel);
- goto error;
+ return -1;
}
switch (def->deviceType) {
@@ -12076,37 +12007,37 @@ virDomainChrDefParseTargetXML(virDomainChrDefPtr def,
portStr = virXMLPropString(cur, "port");
if (VIR_ALLOC(def->target.addr) < 0)
- goto error;
+ return -1;
if (addrStr == NULL) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("guestfwd channel does not "
"define a target address"));
- goto error;
+ return -1;
}
if (virSocketAddrParse(def->target.addr, addrStr, AF_UNSPEC) < 0)
- goto error;
+ return -1;
if (def->target.addr->data.stor.ss_family != AF_INET) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
"%s", _("guestfwd channel only supports
"
"IPv4 addresses"));
- goto error;
+ return -1;
}
if (portStr == NULL) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("guestfwd channel does "
"not define a target port"));
- goto error;
+ return -1;
}
if (virStrToLong_ui(portStr, NULL, 10, &port) < 0) {
virReportError(VIR_ERR_XML_ERROR,
_("Invalid port number: %s"),
portStr);
- goto error;
+ return -1;
}
virSocketAddrSetPort(def->target.addr, port);
@@ -12125,7 +12056,7 @@ virDomainChrDefParseTargetXML(virDomainChrDefPtr def,
virReportError(VIR_ERR_XML_ERROR,
_("invalid channel state value
'%s'"),
stateStr);
- goto error;
+ return -1;
}
def->state = tmp;
@@ -12146,16 +12077,13 @@ virDomainChrDefParseTargetXML(virDomainChrDefPtr def,
virReportError(VIR_ERR_XML_ERROR,
_("Invalid port number: %s"),
portStr);
- goto error;
+ return -1;
}
def->target.port = port;
break;
}
-
- ret = 0;
- error:
- return ret;
+ return 0;
}
typedef enum {
@@ -12174,19 +12102,17 @@ typedef enum {
static int
virDomainChrSourceDefParseMode(xmlNodePtr source)
{
- int ret = -1;
VIR_AUTOFREE(char *) mode = virXMLPropString(source, "mode");
if (!mode || STREQ(mode, "connect")) {
- ret = VIR_DOMAIN_CHR_SOURCE_MODE_CONNECT;
+ return VIR_DOMAIN_CHR_SOURCE_MODE_CONNECT;
} else if (STREQ(mode, "bind")) {
- ret = VIR_DOMAIN_CHR_SOURCE_MODE_BIND;
- } else {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("Unknown source mode '%s'"), mode);
+ return VIR_DOMAIN_CHR_SOURCE_MODE_BIND;
}
- return ret;
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ _("Unknown source mode '%s'"), mode);
+ return -1;
}
@@ -12201,7 +12127,7 @@ virDomainChrSourceDefParseTCP(virDomainChrSourceDefPtr def,
VIR_AUTOFREE(char *) tmp = NULL;
if ((mode = virDomainChrSourceDefParseMode(source)) < 0)
- goto error;
+ return -1;
def->data.tcp.listen = mode == VIR_DOMAIN_CHR_SOURCE_MODE_BIND;
def->data.tcp.host = virXMLPropString(source, "host");
@@ -12212,7 +12138,7 @@ virDomainChrSourceDefParseTCP(virDomainChrSourceDefPtr def,
virReportError(VIR_ERR_XML_ERROR,
_("unknown chardev 'tls' setting
'%s'"),
tmp);
- goto error;
+ return -1;
}
VIR_FREE(tmp);
}
@@ -12223,7 +12149,7 @@ virDomainChrSourceDefParseTCP(virDomainChrSourceDefPtr def,
virReportError(VIR_ERR_XML_ERROR,
_("Invalid tlsFromConfig value: %s"),
tmp);
- goto error;
+ return -1;
}
def->data.tcp.tlsFromConfig = !!tmpVal;
}
@@ -12231,13 +12157,10 @@ virDomainChrSourceDefParseTCP(virDomainChrSourceDefPtr def,
if (virDomainChrSourceReconnectDefParseXML(&def->data.tcp.reconnect,
source,
ctxt) < 0) {
- goto error;
+ return -1;
}
return 0;
-
- error:
- return -1;
}
@@ -13573,7 +13496,6 @@ virDomainGraphicsDefParseXMLVNC(virDomainGraphicsDefPtr def,
xmlXPathContextPtr ctxt,
unsigned int flags)
{
- int ret = -1;
VIR_AUTOFREE(char *) port = virXMLPropString(node, "port");
VIR_AUTOFREE(char *) websocket = virXMLPropString(node, "websocket");
VIR_AUTOFREE(char *) websocketGenerated = virXMLPropString(node,
"websocketGenerated");
@@ -13581,13 +13503,13 @@ virDomainGraphicsDefParseXMLVNC(virDomainGraphicsDefPtr def,
VIR_AUTOFREE(char *) autoport = virXMLPropString(node, "autoport");
if (virDomainGraphicsListensParseXML(def, node, ctxt, flags) < 0)
- goto cleanup;
+ return -1;
if (port) {
if (virStrToLong_i(port, NULL, 10, &def->data.vnc.port) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("cannot parse vnc port %s"), port);
- goto cleanup;
+ return -1;
}
/* Legacy compat syntax, used -1 for auto-port */
if (def->data.vnc.port == -1) {
@@ -13616,7 +13538,7 @@ virDomainGraphicsDefParseXMLVNC(virDomainGraphicsDefPtr def,
&def->data.vnc.websocket) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("cannot parse vnc WebSocket port %s"),
websocket);
- goto cleanup;
+ return -1;
}
}
@@ -13631,7 +13553,7 @@ virDomainGraphicsDefParseXMLVNC(virDomainGraphicsDefPtr def,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown vnc display sharing policy
'%s'"),
sharePolicy);
- goto cleanup;
+ return -1;
} else {
def->data.vnc.sharePolicy = policy;
}
@@ -13641,11 +13563,9 @@ virDomainGraphicsDefParseXMLVNC(virDomainGraphicsDefPtr def,
if (virDomainGraphicsAuthDefParseXML(node, &def->data.vnc.auth,
def->type) < 0)
- goto cleanup;
+ return -1;
- ret = 0;
- cleanup:
- return ret;
+ return 0;
}
@@ -13711,20 +13631,19 @@ virDomainGraphicsDefParseXMLRDP(virDomainGraphicsDefPtr def,
xmlXPathContextPtr ctxt,
unsigned int flags)
{
- int ret = -1;
VIR_AUTOFREE(char *) port = virXMLPropString(node, "port");
VIR_AUTOFREE(char *) autoport = virXMLPropString(node, "autoport");
VIR_AUTOFREE(char *) replaceUser = virXMLPropString(node, "replaceUser");
VIR_AUTOFREE(char *) multiUser = virXMLPropString(node, "multiUser");
if (virDomainGraphicsListensParseXML(def, node, ctxt, flags) < 0)
- goto error;
+ return -1;
if (port) {
if (virStrToLong_i(port, NULL, 10, &def->data.rdp.port) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("cannot parse rdp port %s"), port);
- goto error;
+ return -1;
}
/* Legacy compat syntax, used -1 for auto-port */
if (def->data.rdp.port == -1)
@@ -13747,9 +13666,7 @@ virDomainGraphicsDefParseXMLRDP(virDomainGraphicsDefPtr def,
if (STREQ_NULLABLE(multiUser, "yes"))
def->data.rdp.multiUser = true;
- ret = 0;
- error:
- return ret;
+ return 0;
}
@@ -13757,7 +13674,6 @@ static int
virDomainGraphicsDefParseXMLDesktop(virDomainGraphicsDefPtr def,
xmlNodePtr node)
{
- int ret = -1;
VIR_AUTOFREE(char *) fullscreen = virXMLPropString(node, "fullscreen");
if (fullscreen != NULL) {
@@ -13768,7 +13684,7 @@ virDomainGraphicsDefParseXMLDesktop(virDomainGraphicsDefPtr def,
} else {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("unknown fullscreen value '%s'"),
fullscreen);
- goto cleanup;
+ return -1;
}
} else {
def->data.desktop.fullscreen = false;
@@ -13776,9 +13692,7 @@ virDomainGraphicsDefParseXMLDesktop(virDomainGraphicsDefPtr def,
def->data.desktop.display = virXMLPropString(node, "display");
- ret = 0;
- cleanup:
- return ret;
+ return 0;
}
@@ -13790,20 +13704,19 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
{
xmlNodePtr cur;
int defaultModeVal;
- int ret = -1;
VIR_AUTOFREE(char *) port = virXMLPropString(node, "port");
VIR_AUTOFREE(char *) tlsPort = virXMLPropString(node, "tlsPort");
VIR_AUTOFREE(char *) autoport = virXMLPropString(node, "autoport");
VIR_AUTOFREE(char *) defaultMode = virXMLPropString(node, "defaultMode");
if (virDomainGraphicsListensParseXML(def, node, ctxt, flags) < 0)
- goto error;
+ return -1;
if (port) {
if (virStrToLong_i(port, NULL, 10, &def->data.spice.port) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("cannot parse spice port %s"), port);
- goto error;
+ return -1;
}
} else {
def->data.spice.port = 0;
@@ -13813,7 +13726,7 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
if (virStrToLong_i(tlsPort, NULL, 10, &def->data.spice.tlsPort) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("cannot parse spice tlsPort %s"), tlsPort);
- goto error;
+ return -1;
}
} else {
def->data.spice.tlsPort = 0;
@@ -13829,7 +13742,7 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown default spice channel mode %s"),
defaultMode);
- goto error;
+ return -1;
}
def->data.spice.defaultMode = defaultModeVal;
}
@@ -13848,7 +13761,7 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
if (virDomainGraphicsAuthDefParseXML(node, &def->data.spice.auth,
def->type) < 0)
- goto error;
+ return -1;
cur = node->children;
while (cur != NULL) {
@@ -13864,20 +13777,20 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
if (!name || !mode) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("spice channel missing name/mode"));
- goto error;
+ return -1;
}
if ((nameval = virDomainGraphicsSpiceChannelNameTypeFromString(name))
< 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown spice channel name %s"),
name);
- goto error;
+ return -1;
}
if ((modeval = virDomainGraphicsSpiceChannelModeTypeFromString(mode))
< 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown spice channel mode %s"),
mode);
- goto error;
+ return -1;
}
def->data.spice.channels[nameval] = modeval;
@@ -13888,7 +13801,7 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
if (!compression) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("spice image missing compression"));
- goto error;
+ return -1;
}
if ((compressionVal =
@@ -13896,7 +13809,7 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown spice image compression %s"),
compression);
- goto error;
+ return -1;
}
def->data.spice.image = compressionVal;
@@ -13907,7 +13820,7 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
if (!compression) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("spice jpeg missing compression"));
- goto error;
+ return -1;
}
if ((compressionVal =
@@ -13915,7 +13828,7 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown spice jpeg compression %s"),
compression);
- goto error;
+ return -1;
}
def->data.spice.jpeg = compressionVal;
@@ -13926,7 +13839,7 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
if (!compression) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("spice zlib missing compression"));
- goto error;
+ return -1;
}
if ((compressionVal =
@@ -13934,7 +13847,7 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown spice zlib compression %s"),
compression);
- goto error;
+ return -1;
}
def->data.spice.zlib = compressionVal;
@@ -13945,15 +13858,14 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
if (!compression) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("spice playback missing compression"));
- goto error;
+ return -1;
}
if ((compressionVal =
virTristateSwitchTypeFromString(compression)) <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("unknown spice playback compression"));
- goto error;
-
+ return -1;
}
def->data.spice.playback = compressionVal;
@@ -13964,14 +13876,13 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
if (!mode) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("spice streaming missing mode"));
- goto error;
+ return -1;
}
if ((modeVal =
virDomainGraphicsSpiceStreamingModeTypeFromString(mode)) <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("unknown spice streaming mode"));
- goto error;
-
+ return -1;
}
def->data.spice.streaming = modeVal;
@@ -13982,14 +13893,14 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
if (!copypaste) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("spice clipboard missing copypaste"));
- goto error;
+ return -1;
}
if ((copypasteVal =
virTristateBoolTypeFromString(copypaste)) <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown copypaste value '%s'"),
copypaste);
- goto error;
+ return -1;
}
def->data.spice.copypaste = copypasteVal;
@@ -14000,14 +13911,14 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
if (!enable) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("spice filetransfer missing enable"));
- goto error;
+ return -1;
}
if ((enableVal =
virTristateBoolTypeFromString(enable)) <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown enable value '%s'"),
enable);
- goto error;
+ return -1;
}
def->data.spice.filetransfer = enableVal;
@@ -14019,14 +13930,14 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
if (!enable) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("spice gl element missing enable"));
- goto error;
+ return -1;
}
if ((enableVal =
virTristateBoolTypeFromString(enable)) <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown enable value '%s'"),
enable);
- goto error;
+ return -1;
}
def->data.spice.gl = enableVal;
@@ -14039,14 +13950,14 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
if (!mode) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("spice mouse missing mode"));
- goto error;
+ return -1;
}
if ((modeVal = virDomainGraphicsSpiceMouseModeTypeFromString(mode)) <=
0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown mouse mode value '%s'"),
mode);
- goto error;
+ return -1;
}
def->data.spice.mousemode = modeVal;
@@ -14055,9 +13966,7 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphicsDefPtr def,
cur = cur->next;
}
- ret = 0;
- error:
- return ret;
+ return 0;
}
@@ -15585,7 +15494,6 @@ virDomainPMStateParseXML(xmlXPathContextPtr ctxt,
const char *xpath,
int *val)
{
- int ret = -1;
VIR_AUTOFREE(char *) tmp = virXPathString(xpath, ctxt);
if (tmp) {
@@ -15593,13 +15501,11 @@ virDomainPMStateParseXML(xmlXPathContextPtr ctxt,
if (*val < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown PM state value %s"), tmp);
- goto cleanup;
+ return -1;
}
}
- ret = 0;
- cleanup:
- return ret;
+ return 0;
}
@@ -15608,44 +15514,40 @@ virDomainPerfEventDefParseXML(virDomainPerfDefPtr perf,
xmlNodePtr node)
{
int event;
- int ret = -1;
VIR_AUTOFREE(char *) name = NULL;
VIR_AUTOFREE(char *) enabled = NULL;
if (!(name = virXMLPropString(node, "name"))) {
virReportError(VIR_ERR_XML_ERROR, "%s", _("missing perf event
name"));
- goto cleanup;
+ return -1;
}
if ((event = virPerfEventTypeFromString(name)) < 0) {
virReportError(VIR_ERR_XML_ERROR,
_("'unsupported perf event '%s'"), name);
- goto cleanup;
+ return -1;
}
if (perf->events[event] != VIR_TRISTATE_BOOL_ABSENT) {
virReportError(VIR_ERR_XML_ERROR,
_("perf event '%s' was already specified"),
name);
- goto cleanup;
+ return -1;
}
if (!(enabled = virXMLPropString(node, "enabled"))) {
virReportError(VIR_ERR_XML_ERROR,
_("missing state of perf event '%s'"), name);
- goto cleanup;
+ return -1;
}
if ((perf->events[event] = virTristateBoolTypeFromString(enabled)) < 0) {
virReportError(VIR_ERR_XML_ERROR,
_("invalid state '%s' of perf event
'%s'"),
enabled, name);
- goto cleanup;
+ return -1;
}
- ret = 0;
-
- cleanup:
- return ret;
+ return 0;
}
static int
@@ -15653,7 +15555,6 @@ virDomainPerfDefParseXML(virDomainDefPtr def,
xmlXPathContextPtr ctxt)
{
size_t i;
- int ret = -1;
int n;
VIR_AUTOFREE(xmlNodePtr *) nodes = NULL;
@@ -15662,13 +15563,10 @@ virDomainPerfDefParseXML(virDomainDefPtr def,
for (i = 0; i < n; i++) {
if (virDomainPerfEventDefParseXML(&def->perf, nodes[i]) < 0)
- goto cleanup;
+ return -1;
}
- ret = 0;
-
- cleanup:
- return ret;
+ return 0;
}
static int
@@ -17674,13 +17572,12 @@ virDomainDefParseBootXML(xmlXPathContextPtr ctxt,
xmlNodePtr node;
size_t i;
int n;
- int ret = -1;
VIR_AUTOFREE(char *) tmp = NULL;
VIR_AUTOFREE(xmlNodePtr *) nodes = NULL;
/* analysis of the boot devices */
if ((n = virXPathNodeSet("./os/boot", ctxt, &nodes)) < 0)
- goto cleanup;
+ return -1;
for (i = 0; i < n && i < VIR_DOMAIN_BOOT_LAST; i++) {
int val;
@@ -17688,14 +17585,14 @@ virDomainDefParseBootXML(xmlXPathContextPtr ctxt,
if (!dev) {
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("missing boot device"));
- goto cleanup;
+ return -1;
}
if ((val = virDomainBootTypeFromString(dev)) < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown boot device '%s'"),
dev);
VIR_FREE(dev);
- goto cleanup;
+ return -1;
}
VIR_FREE(dev);
def->os.bootDevs[def->os.nBootDevs++] = val;
@@ -17723,7 +17620,7 @@ virDomainDefParseBootXML(xmlXPathContextPtr ctxt,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("invalid value for boot menu timeout, "
"must be in range [0,65535]"));
- goto cleanup;
+ return -1;
}
def->os.bm_timeout_set = true;
}
@@ -17749,16 +17646,13 @@ virDomainDefParseBootXML(xmlXPathContextPtr ctxt,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("invalid value for rebootTimeout, "
"must be in range [-1,65535]"));
- goto cleanup;
+ return -1;
}
def->os.bios.rt_set = true;
}
}
- ret = 0;
-
- cleanup:
- return ret;
+ return 0;
}
@@ -17879,41 +17773,35 @@ virDomainDefParseIOThreads(virDomainDefPtr def,
if (tmp && virStrToLong_uip(tmp, NULL, 10, &iothreads) < 0) {
virReportError(VIR_ERR_XML_ERROR,
_("invalid iothreads count '%s'"), tmp);
- goto error;
+ return -1;
}
/* Extract any iothread id's defined */
if ((n = virXPathNodeSet("./iothreadids/iothread", ctxt, &nodes)) <
0)
- goto error;
+ return -1;
if (n > iothreads)
iothreads = n;
if (n && VIR_ALLOC_N(def->iothreadids, n) < 0)
- goto error;
+ return -1;
for (i = 0; i < n; i++) {
virDomainIOThreadIDDefPtr iothrid = NULL;
if (!(iothrid = virDomainIOThreadIDDefParseXML(nodes[i])))
- goto error;
+ return -1;
if (virDomainIOThreadIDFind(def, iothrid->iothread_id)) {
virReportError(VIR_ERR_XML_ERROR,
_("duplicate iothread id '%u' found"),
iothrid->iothread_id);
virDomainIOThreadIDDefFree(iothrid);
- goto error;
+ return -1;
}
def->iothreadids[def->niothreadids++] = iothrid;
}
- if (virDomainIOThreadIDDefArrayInit(def, iothreads) < 0)
- goto error;
-
- return 0;
-
- error:
- return -1;
+ return virDomainIOThreadIDDefArrayInit(def, iothreads);
}
@@ -17928,52 +17816,47 @@ virDomainVcpuPinDefParseXML(virDomainDefPtr def,
{
virDomainVcpuDefPtr vcpu;
unsigned int vcpuid;
- int ret = -1;
VIR_AUTOFREE(char *) tmp = NULL;
if (!(tmp = virXMLPropString(node, "vcpu"))) {
virReportError(VIR_ERR_XML_ERROR, "%s", _("missing vcpu id in
vcpupin"));
- goto cleanup;
+ return -1;
}
if (virStrToLong_uip(tmp, NULL, 10, &vcpuid) < 0) {
virReportError(VIR_ERR_XML_ERROR,
_("invalid setting for vcpu '%s'"), tmp);
- goto cleanup;
+ return -1;
}
VIR_FREE(tmp);
if (!(vcpu = virDomainDefGetVcpu(def, vcpuid))) {
VIR_WARN("Ignoring vcpupin for missing vcpus");
- ret = 0;
- goto cleanup;
+ return 0;
}
if (!(tmp = virXMLPropString(node, "cpuset"))) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("missing cpuset for vcpupin"));
- goto cleanup;
+ return -1;
}
if (vcpu->cpumask) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("duplicate vcpupin for vcpu '%d'"), vcpuid);
- goto cleanup;
+ return -1;
}
if (virBitmapParse(tmp, &vcpu->cpumask, VIR_DOMAIN_CPUMASK_LEN) < 0)
- goto cleanup;
+ return -1;
if (virBitmapIsAllClear(vcpu->cpumask)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Invalid value of 'cpuset': %s"), tmp);
- goto cleanup;
+ return -1;
}
- ret = 0;
-
- cleanup:
- return ret;
+ return 0;
}
@@ -17985,7 +17868,6 @@ static int
virDomainIOThreadPinDefParseXML(xmlNodePtr node,
virDomainDefPtr def)
{
- int ret = -1;
virDomainIOThreadIDDefPtr iothrid;
unsigned int iothreadid;
VIR_AUTOFREE(char *) tmp = NULL;
@@ -17994,57 +17876,54 @@ virDomainIOThreadPinDefParseXML(xmlNodePtr node,
if (!(tmp = virXMLPropString(node, "iothread"))) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("missing iothread id in iothreadpin"));
- goto cleanup;
+ return -1;
}
if (virStrToLong_uip(tmp, NULL, 10, &iothreadid) < 0) {
virReportError(VIR_ERR_XML_ERROR,
_("invalid setting for iothread '%s'"), tmp);
- goto cleanup;
+ return -1;
}
VIR_FREE(tmp);
if (iothreadid == 0) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("zero is an invalid iothread id value"));
- goto cleanup;
+ return -1;
}
if (!(iothrid = virDomainIOThreadIDFind(def, iothreadid))) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Cannot find 'iothread' : %u"),
iothreadid);
- goto cleanup;
+ return -1;
}
if (!(tmp = virXMLPropString(node, "cpuset"))) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("missing cpuset for iothreadpin"));
- goto cleanup;
+ return -1;
}
if (virBitmapParse(tmp, &cpumask, VIR_DOMAIN_CPUMASK_LEN) < 0)
- goto cleanup;
+ return -1;
if (virBitmapIsAllClear(cpumask)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Invalid value of 'cpuset': %s"),
tmp);
- goto cleanup;
+ return -1;
}
if (iothrid->cpumask) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("duplicate iothreadpin for same iothread
'%u'"),
iothreadid);
- goto cleanup;
+ return -1;
}
VIR_STEAL_PTR(iothrid->cpumask, cpumask);
- ret = 0;
-
- cleanup:
- return ret;
+ return 0;
}
@@ -18066,17 +17945,15 @@ virDomainEmulatorPinDefParseXML(xmlNodePtr node)
}
if (virBitmapParse(tmp, &def, VIR_DOMAIN_CPUMASK_LEN) < 0)
- goto cleanup;
+ return NULL;
if (virBitmapIsAllClear(def)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Invalid value of 'cpuset': %s"), tmp);
- goto cleanup;
+ return NULL;
}
VIR_STEAL_PTR(ret, def);
-
- cleanup:
return ret;
}
@@ -18315,7 +18192,6 @@ static int
virDomainLoaderDefParseXML(xmlNodePtr node,
virDomainLoaderDefPtr loader)
{
- int ret = -1;
VIR_AUTOFREE(char *) readonly_str = NULL;
VIR_AUTOFREE(char *) secure_str = NULL;
VIR_AUTOFREE(char *) type_str = NULL;
@@ -18329,14 +18205,14 @@ virDomainLoaderDefParseXML(xmlNodePtr node,
(loader->readonly = virTristateBoolTypeFromString(readonly_str)) <= 0) {
virReportError(VIR_ERR_XML_DETAIL,
_("unknown readonly value: %s"), readonly_str);
- goto cleanup;
+ return -1;
}
if (secure_str &&
(loader->secure = virTristateBoolTypeFromString(secure_str)) <= 0) {
virReportError(VIR_ERR_XML_DETAIL,
_("unknown secure value: %s"), secure_str);
- goto cleanup;
+ return -1;
}
if (type_str) {
@@ -18344,14 +18220,12 @@ virDomainLoaderDefParseXML(xmlNodePtr node,
if ((type = virDomainLoaderTypeFromString(type_str)) < 0) {
virReportError(VIR_ERR_XML_DETAIL,
_("unknown type value: %s"), type_str);
- goto cleanup;
+ return -1;
}
loader->type = type;
}
- ret = 0;
- cleanup:
- return ret;
+ return 0;
}
@@ -18503,7 +18377,6 @@ virDomainVcpuParse(virDomainDefPtr def,
size_t i;
unsigned int maxvcpus;
unsigned int vcpus;
- int ret = -1;
VIR_AUTOFREE(char *) tmp = NULL;
VIR_AUTOFREE(xmlNodePtr *) nodes = NULL;
@@ -18514,7 +18387,7 @@ virDomainVcpuParse(virDomainDefPtr def,
if (virStrToLong_ui(tmp, NULL, 10, &maxvcpus) < 0) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("maximum vcpus count must be an integer"));
- goto cleanup;
+ return -1;
}
VIR_FREE(tmp);
}
@@ -18523,7 +18396,7 @@ virDomainVcpuParse(virDomainDefPtr def,
if (virStrToLong_ui(tmp, NULL, 10, &vcpus) < 0) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("current vcpus count must be an integer"));
- goto cleanup;
+ return -1;
}
VIR_FREE(tmp);
} else {
@@ -18537,7 +18410,7 @@ virDomainVcpuParse(virDomainDefPtr def,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Unsupported CPU placement mode
'%s'"),
tmp);
- goto cleanup;
+ return -1;
}
VIR_FREE(tmp);
} else {
@@ -18548,12 +18421,12 @@ virDomainVcpuParse(virDomainDefPtr def,
tmp = virXMLPropString(vcpuNode, "cpuset");
if (tmp) {
if (virBitmapParse(tmp, &def->cpumask, VIR_DOMAIN_CPUMASK_LEN)
< 0)
- goto cleanup;
+ return -1;
if (virBitmapIsAllClear(def->cpumask)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Invalid value of 'cpuset': %s"),
tmp);
- goto cleanup;
+ return -1;
}
VIR_FREE(tmp);
@@ -18562,10 +18435,10 @@ virDomainVcpuParse(virDomainDefPtr def,
}
if (virDomainDefSetVcpusMax(def, maxvcpus, xmlopt) < 0)
- goto cleanup;
+ return -1;
if ((n = virXPathNodeSet("./vcpus/vcpu", ctxt, &nodes)) < 0)
- goto cleanup;
+ return -1;
if (n) {
/* if individual vcpu states are provided take them as master */
@@ -18581,7 +18454,7 @@ virDomainVcpuParse(virDomainDefPtr def,
virStrToLong_uip(tmp, NULL, 10, &id) < 0) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("missing or invalid vcpu id"));
- goto cleanup;
+ return -1;
}
VIR_FREE(tmp);
@@ -18590,7 +18463,7 @@ virDomainVcpuParse(virDomainDefPtr def,
virReportError(VIR_ERR_XML_ERROR,
_("vcpu id '%u' is out of range of maximum
"
"vcpu count"), id);
- goto cleanup;
+ return -1;
}
vcpu = virDomainDefGetVcpu(def, id);
@@ -18598,13 +18471,13 @@ virDomainVcpuParse(virDomainDefPtr def,
if (!(tmp = virXMLPropString(nodes[i], "enabled"))) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("missing vcpu enabled state"));
- goto cleanup;
+ return -1;
}
if ((state = virTristateBoolTypeFromString(tmp)) < 0) {
virReportError(VIR_ERR_XML_ERROR,
_("invalid vcpu 'enabled' value
'%s'"), tmp);
- goto cleanup;
+ return -1;
}
VIR_FREE(tmp);
@@ -18615,7 +18488,7 @@ virDomainVcpuParse(virDomainDefPtr def,
if ((hotpluggable = virTristateBoolTypeFromString(tmp)) < 0) {
virReportError(VIR_ERR_XML_ERROR,
_("invalid vcpu 'hotpluggable' value
'%s'"), tmp);
- goto cleanup;
+ return -1;
}
vcpu->hotpluggable = hotpluggable;
VIR_FREE(tmp);
@@ -18625,7 +18498,7 @@ virDomainVcpuParse(virDomainDefPtr def,
if (virStrToLong_uip(tmp, NULL, 10, &order) < 0) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("invalid vcpu order"));
- goto cleanup;
+ return -1;
}
vcpu->order = order;
VIR_FREE(tmp);
@@ -18633,13 +18506,10 @@ virDomainVcpuParse(virDomainDefPtr def,
}
} else {
if (virDomainDefSetVcpus(def, vcpus) < 0)
- goto cleanup;
+ return -1;
}
- ret = 0;
-
- cleanup:
- return ret;
+ return 0;
}
@@ -18648,7 +18518,6 @@ virDomainDefParseBootOptions(virDomainDefPtr def,
xmlXPathContextPtr ctxt)
{
char *name = NULL;
- int ret = -1;
size_t i;
int n;
VIR_AUTOFREE(xmlNodePtr *) nodes = NULL;
@@ -18671,34 +18540,34 @@ virDomainDefParseBootOptions(virDomainDefPtr def,
def->os.initgroup = virXPathString("string(./os/initgroup[1])",
ctxt);
if ((n = virXPathNodeSet("./os/initarg", ctxt, &nodes)) < 0)
- goto error;
+ return -1;
if (VIR_ALLOC_N(def->os.initargv, n+1) < 0)
- goto error;
+ return -1;
for (i = 0; i < n; i++) {
if (!nodes[i]->children ||
!nodes[i]->children->content) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("No data supplied for <initarg>
element"));
- goto error;
+ return -1;
}
if (VIR_STRDUP(def->os.initargv[i],
(const char*) nodes[i]->children->content) < 0)
- goto error;
+ return -1;
}
def->os.initargv[n] = NULL;
VIR_FREE(nodes);
if ((n = virXPathNodeSet("./os/initenv", ctxt, &nodes)) < 0)
- goto error;
+ return -1;
if (VIR_ALLOC_N(def->os.initenv, n+1) < 0)
- goto error;
+ return -1;
for (i = 0; i < n; i++) {
if (!(name = virXMLPropString(nodes[i], "name"))) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("No name supplied for <initenv>
element"));
- goto error;
+ return -1;
}
if (!nodes[i]->children ||
@@ -18706,16 +18575,16 @@ virDomainDefParseBootOptions(virDomainDefPtr def,
virReportError(VIR_ERR_XML_ERROR,
_("No value supplied for <initenv
name='%s'> element"),
name);
- goto error;
+ return -1;
}
if (VIR_ALLOC(def->os.initenv[i]) < 0)
- goto error;
+ return -1;
def->os.initenv[i]->name = name;
if (VIR_STRDUP(def->os.initenv[i]->value,
(const char*) nodes[i]->children->content) < 0)
- goto error;
+ return -1;
}
def->os.initenv[n] = NULL;
VIR_FREE(nodes);
@@ -18734,10 +18603,10 @@ virDomainDefParseBootOptions(virDomainDefPtr def,
def->os.root = virXPathString("string(./os/root[1])", ctxt);
if ((loader_node = virXPathNode("./os/loader[1]", ctxt))) {
if (VIR_ALLOC(def->os.loader) < 0)
- goto error;
+ return -1;
if (virDomainLoaderDefParseXML(loader_node, def->os.loader) < 0)
- goto error;
+ return -1;
def->os.loader->nvram =
virXPathString("string(./os/nvram[1])", ctxt);
def->os.loader->templt =
virXPathString("string(./os/nvram[1]/@template)", ctxt);
@@ -18746,12 +18615,12 @@ virDomainDefParseBootOptions(virDomainDefPtr def,
if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) {
if ((n = virXPathNodeSet("./os/acpi/table", ctxt, &nodes)) < 0)
- goto error;
+ return -1;
if (n > 1) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("Only one acpi table is supported"));
- goto error;
+ return -1;
}
if (n == 1) {
@@ -18760,30 +18629,26 @@ virDomainDefParseBootOptions(virDomainDefPtr def,
if (!tmp) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("Missing acpi table type"));
- goto error;
+ return -1;
}
if (STREQ_NULLABLE(tmp, "slic")) {
VIR_FREE(tmp);
tmp = virXMLNodeContentString(nodes[0]);
def->os.slic_table = virFileSanitizePath(tmp);
- VIR_FREE(tmp);
} else {
virReportError(VIR_ERR_XML_ERROR,
_("Unknown acpi table type: %s"),
tmp);
- goto error;
+ return -1;
}
}
if (virDomainDefParseBootXML(ctxt, def) < 0)
- goto error;
+ return -1;
}
- ret = 0;
-
- error:
- return ret;
+ return 0;
}
@@ -18792,29 +18657,26 @@ virDomainResctrlParseVcpus(virDomainDefPtr def,
xmlNodePtr node,
virBitmapPtr *vcpus)
{
- int ret = -1;
VIR_AUTOFREE(char *) vcpus_str = NULL;
vcpus_str = virXMLPropString(node, "vcpus");
if (!vcpus_str) {
virReportError(VIR_ERR_XML_ERROR, _("Missing %s attribute
'vcpus'"),
node->name);
- goto cleanup;
+ return -1;
}
if (virBitmapParse(vcpus_str, vcpus, VIR_DOMAIN_CPUMASK_LEN) < 0) {
virReportError(VIR_ERR_XML_ERROR,
_("Invalid %s attribute 'vcpus' value
'%s'"),
node->name, vcpus_str);
- goto cleanup;
+ return -1;
}
/* We need to limit the bitmap to number of vCPUs. If there's nothing left,
* then we can just clean up and return 0 immediately */
virBitmapShrink(*vcpus, def->maxvcpus);
- ret = 0;
- cleanup:
- return ret;
+ return 0;
}
@@ -19216,7 +19078,6 @@ virDomainDefParseCaps(virDomainDefPtr def,
virCapsPtr caps,
unsigned int flags)
{
- int ret = -1;
VIR_AUTOFREE(char *) virttype = NULL;
VIR_AUTOFREE(char *) arch = NULL;
VIR_AUTOFREE(char *) ostype = NULL;
@@ -19234,12 +19095,12 @@ virDomainDefParseCaps(virDomainDefPtr def,
if (!virttype) {
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("missing domain type attribute"));
- goto cleanup;
+ return -1;
}
if ((def->virtType = virDomainVirtTypeFromString(virttype)) < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("invalid domain type %s"), virttype);
- goto cleanup;
+ return -1;
}
if (!ostype) {
@@ -19248,13 +19109,13 @@ virDomainDefParseCaps(virDomainDefPtr def,
} else {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("an os <type> must be specified"));
- goto cleanup;
+ return -1;
}
} else {
if ((def->os.type = virDomainOSTypeFromString(ostype)) < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown OS type '%s'"), ostype);
- goto cleanup;
+ return -1;
}
}
@@ -19271,7 +19132,7 @@ virDomainDefParseCaps(virDomainDefPtr def,
if (arch && !(def->os.arch = virArchFromString(arch))) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Unknown architecture %s"), arch);
- goto cleanup;
+ return -1;
}
if (!(capsdata = virCapabilitiesDomainDataLookup(caps, def->os.type,
@@ -19279,19 +19140,17 @@ virDomainDefParseCaps(virDomainDefPtr def,
def->virtType,
NULL, NULL))) {
if (!(flags & VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE))
- goto cleanup;
+ return -1;
virResetLastError();
} else {
if (!def->os.arch)
def->os.arch = capsdata->arch;
if ((!def->os.machine &&
VIR_STRDUP(def->os.machine, capsdata->machinetype) < 0))
- goto cleanup;
+ return -1;
}
- ret = 0;
- cleanup:
- return ret;
+ return 0;
}
@@ -26155,7 +26014,6 @@ static int
virDomainMemorySourceDefFormat(virBufferPtr buf,
virDomainMemoryDefPtr def)
{
- int ret = -1;
VIR_AUTOFREE(char *) bitmap = NULL;
if (!def->pagesize && !def->sourceNodes &&
!def->nvdimmPath)
@@ -26168,7 +26026,7 @@ virDomainMemorySourceDefFormat(virBufferPtr buf,
case VIR_DOMAIN_MEMORY_MODEL_DIMM:
if (def->sourceNodes) {
if (!(bitmap = virBitmapFormat(def->sourceNodes)))
- goto cleanup;
+ return -1;
virBufferAsprintf(buf, "<nodemask>%s</nodemask>\n",
bitmap);
}
@@ -26197,10 +26055,7 @@ virDomainMemorySourceDefFormat(virBufferPtr buf,
virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</source>\n");
- ret = 0;
-
- cleanup:
- return ret;
+ return 0;
}
@@ -27619,7 +27474,6 @@ virDomainCpuDefFormat(virBufferPtr buf,
{
virDomainVcpuDefPtr vcpu;
size_t i;
- int ret = -1;
VIR_AUTOFREE(char *) cpumask = NULL;
virBufferAddLit(buf, "<vcpu");
@@ -27628,7 +27482,7 @@ virDomainCpuDefFormat(virBufferPtr buf,
if (def->cpumask && !virBitmapIsAllSet(def->cpumask)) {
if ((cpumask = virBitmapFormat(def->cpumask)) == NULL)
- goto cleanup;
+ return -1;
virBufferAsprintf(buf, " cpuset='%s'", cpumask);
}
if (virDomainDefHasVcpusOffline(def))
@@ -27656,10 +27510,7 @@ virDomainCpuDefFormat(virBufferPtr buf,
virBufferAddLit(buf, "</vcpus>\n");
}
- ret = 0;
-
- cleanup:
- return ret;
+ return 0;
}
@@ -28863,29 +28714,25 @@ virDomainSaveXML(const char *configDir,
const char *xml)
{
char uuidstr[VIR_UUID_STRING_BUFLEN];
- int ret = -1;
VIR_AUTOFREE(char *) configFile = NULL;
if (!configDir)
return 0;
if ((configFile = virDomainConfigFile(configDir, def->name)) == NULL)
- goto cleanup;
+ return -1;
if (virFileMakePath(configDir) < 0) {
virReportSystemError(errno,
_("cannot create config directory '%s'"),
configDir);
- goto cleanup;
+ return -1;
}
virUUIDFormat(def->uuid, uuidstr);
- ret = virXMLSaveFile(configFile,
- virXMLPickShellSafeComment(def->name, uuidstr),
"edit",
- xml);
-
- cleanup:
- return ret;
+ return virXMLSaveFile(configFile,
+ virXMLPickShellSafeComment(def->name, uuidstr),
"edit",
+ xml);
}
int
@@ -28893,18 +28740,12 @@ virDomainSaveConfig(const char *configDir,
virCapsPtr caps,
virDomainDefPtr def)
{
- int ret = -1;
VIR_AUTOFREE(char *) xml = NULL;
if (!(xml = virDomainDefFormat(def, caps, VIR_DOMAIN_DEF_FORMAT_SECURE)))
- goto cleanup;
-
- if (virDomainSaveXML(configDir, def, xml))
- goto cleanup;
+ return -1;
- ret = 0;
- cleanup:
- return ret;
+ return virDomainSaveXML(configDir, def, xml);
}
int
@@ -28919,18 +28760,12 @@ virDomainSaveStatus(virDomainXMLOptionPtr xmlopt,
VIR_DOMAIN_DEF_FORMAT_PCI_ORIG_STATES |
VIR_DOMAIN_DEF_FORMAT_CLOCK_ADJUST);
- int ret = -1;
VIR_AUTOFREE(char *) xml = NULL;
if (!(xml = virDomainObjFormat(xmlopt, obj, caps, flags)))
- goto cleanup;
-
- if (virDomainSaveXML(statusDir, obj->def, xml))
- goto cleanup;
+ return -1;
- ret = 0;
- cleanup:
- return ret;
+ return virDomainSaveXML(statusDir, obj->def, xml);
}
@@ -28939,15 +28774,14 @@ virDomainDeleteConfig(const char *configDir,
const char *autostartDir,
virDomainObjPtr dom)
{
- int ret = -1;
VIR_AUTOFREE(char *) configFile = NULL;
VIR_AUTOFREE(char *) autostartLink = NULL;
if ((configFile = virDomainConfigFile(configDir, dom->def->name)) == NULL)
- goto cleanup;
+ return -1;
if ((autostartLink = virDomainConfigFile(autostartDir,
dom->def->name)) == NULL)
- goto cleanup;
+ return -1;
/* Not fatal if this doesn't work */
unlink(autostartLink);
@@ -28958,13 +28792,10 @@ virDomainDeleteConfig(const char *configDir,
virReportSystemError(errno,
_("cannot remove config %s"),
configFile);
- goto cleanup;
+ return -1;
}
- ret = 0;
-
- cleanup:
- return ret;
+ return 0;
}
char
@@ -29226,20 +29057,19 @@ virDomainDiskDefForeachPath(virDomainDiskDefPtr disk,
virDomainDiskDefPathIterator iter,
void *opaque)
{
- int ret = -1;
size_t depth = 0;
virStorageSourcePtr tmp;
VIR_AUTOFREE(char *) brokenRaw = NULL;
if (!ignoreOpenFailure) {
if (virStorageFileChainGetBroken(disk->src, &brokenRaw) < 0)
- goto cleanup;
+ return -1;
if (brokenRaw) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("unable to visit backing chain file %s"),
brokenRaw);
- goto cleanup;
+ return -1;
}
}
@@ -29248,16 +29078,13 @@ virDomainDiskDefForeachPath(virDomainDiskDefPtr disk,
if (virStorageSourceIsLocalStorage(tmp) &&
tmp->path) {
if (iter(disk, tmp->path, depth, opaque) < 0)
- goto cleanup;
+ return -1;
}
depth++;
}
- ret = 0;
-
- cleanup:
- return ret;
+ return 0;
}
@@ -29272,7 +29099,6 @@ virDomainDefCopy(virDomainDefPtr src,
void *parseOpaque,
bool migratable)
{
- virDomainDefPtr ret;
unsigned int format_flags = VIR_DOMAIN_DEF_FORMAT_SECURE;
unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE |
VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE;
@@ -29285,9 +29111,7 @@ virDomainDefCopy(virDomainDefPtr src,
if (!(xml = virDomainDefFormat(src, caps, format_flags)))
return NULL;
- ret = virDomainDefParseString(xml, caps, xmlopt, parseOpaque, parse_flags);
-
- return ret;
+ return virDomainDefParseString(xml, caps, xmlopt, parseOpaque, parse_flags);
}
virDomainDefPtr
@@ -29711,7 +29535,6 @@ virDomainDeviceDefCopy(virDomainDeviceDefPtr src,
virCapsPtr caps,
virDomainXMLOptionPtr xmlopt)
{
- virDomainDeviceDefPtr ret = NULL;
virBuffer buf = VIR_BUFFER_INITIALIZER;
int flags = VIR_DOMAIN_DEF_FORMAT_INACTIVE | VIR_DOMAIN_DEF_FORMAT_SECURE;
int rc = -1;
@@ -29791,19 +29614,16 @@ virDomainDeviceDefCopy(virDomainDeviceDefPtr src,
_("Copying definition of '%d' type "
"is not implemented yet."),
src->type);
- goto cleanup;
+ return NULL;
}
if (rc < 0)
- goto cleanup;
+ return NULL;
xmlStr = virBufferContentAndReset(&buf);
- ret = virDomainDeviceDefParse(xmlStr, def, caps, xmlopt,
- VIR_DOMAIN_DEF_PARSE_INACTIVE |
- VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE);
-
- cleanup:
- return ret;
+ return virDomainDeviceDefParse(xmlStr, def, caps, xmlopt,
+ VIR_DOMAIN_DEF_PARSE_INACTIVE |
+ VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE);
}
@@ -30176,11 +29996,10 @@ virDomainDefGetShortName(const virDomainDef *def)
virReportSystemError(errno, "%s",
_("Cannot convert wide character string "
"back to multi-byte domain name"));
- goto cleanup;
+ return NULL;
}
ignore_value(virAsprintf(&ret, "%d-%s", def->id, shortname));
- cleanup:
return ret;
}
--
2.20.1
8:28 a.m.
New subject: [libvirt] [PATCH v3 08/10] conf: Clean up some unnecessary goto paths
On Fri, Mar 01, 2019 at 11:26:50AM -0500, John Ferlan wrote:
Now that we're using VIR_AUTOFREE there's quite a bit of clean
up
possible for now unnecessary goto paths.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
Reviewed-by: Erik Skultety <eskultet(a)redhat.com>
---
src/conf/domain_conf.c | 801 ++++++++++++++++-------------------------
1 file changed, 310 insertions(+), 491 deletions(-)
@@ -7692,7 +7659,6 @@ virDomainHostdevSubsysSCSIDefParseXML(xmlNodePtr
sourcenode,
virDomainHostdevSubsysSCSIPtr scsisrc,
xmlXPathContextPtr ctxt)
{
- int ret = -1;
VIR_AUTOFREE(char *) protocol = NULL;
if ((protocol = virXMLPropString(sourcenode, "protocol"))) {
@@ -7702,17 +7668,14 @@ virDomainHostdevSubsysSCSIDefParseXML(xmlNodePtr sourcenode,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Unknown SCSI subsystem protocol '%s'"),
protocol);
- goto cleanup;
+ return -1;
}
}
if (scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI)
- ret = virDomainHostdevSubsysSCSIiSCSIDefParseXML(sourcenode, scsisrc, ctxt);
- else
- ret = virDomainHostdevSubsysSCSIHostDefParseXML(sourcenode, scsisrc);
+ return virDomainHostdevSubsysSCSIiSCSIDefParseXML(sourcenode, scsisrc, ctxt);
- cleanup:
- return ret;
+ return virDomainHostdevSubsysSCSIHostDefParseXML(sourcenode, scsisrc);
This looks odd. But having the else branch would look even more so.
}
static int
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
10:26 a.m.
New subject: [libvirt] [PATCH v3 09/10] conf: Merge with previous
More path cleanup from code review from methods that I didn't touch
as part of the original set of changes, but Erik called out. Plus now
with the VIR_AUTOUNREF added that meant a couple more modules could be
altered to clean up their return paths.
I will merge with previous once ACK'd
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
src/conf/domain_conf.c | 77 +++++++++++++++++-------------------------
1 file changed, 31 insertions(+), 46 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 5495276e78..be6e223e78 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -1584,14 +1584,13 @@ virDomainVcpuDefNew(virDomainXMLOptionPtr xmlopt)
if (xmlopt && xmlopt->privateData.vcpuNew &&
!(priv = xmlopt->privateData.vcpuNew()))
- goto cleanup;
+ return NULL;
if (VIR_ALLOC(ret) < 0)
- goto cleanup;
+ return NULL;
VIR_STEAL_PTR(ret->privateData, priv);
- cleanup:
return ret;
}
@@ -26990,23 +26989,19 @@ static int
virDomainHugepagesFormatBuf(virBufferPtr buf,
virDomainHugePagePtr hugepage)
{
- int ret = -1;
-
virBufferAsprintf(buf, "<page size='%llu' unit='KiB'",
hugepage->size);
if (hugepage->nodemask) {
VIR_AUTOFREE(char *) nodeset = NULL;
if (!(nodeset = virBitmapFormat(hugepage->nodemask)))
- goto cleanup;
+ return -1;
virBufferAsprintf(buf, " nodeset='%s'", nodeset);
}
virBufferAddLit(buf, "/>\n");
- ret = 0;
- cleanup:
- return ret;
+ return 0;
}
static void
@@ -29726,21 +29721,21 @@ virDomainObjGetMetadata(virDomainObjPtr vm,
if (type >= VIR_DOMAIN_METADATA_LAST) {
virReportError(VIR_ERR_INVALID_ARG,
_("unknown metadata type '%d'"), type);
- goto cleanup;
+ return NULL;
}
if (!(def = virDomainObjGetOneDef(vm, flags)))
- goto cleanup;
+ return NULL;
switch ((virDomainMetadataType) type) {
case VIR_DOMAIN_METADATA_DESCRIPTION:
if (VIR_STRDUP(ret, def->description) < 0)
- goto cleanup;
+ return NULL;
break;
case VIR_DOMAIN_METADATA_TITLE:
if (VIR_STRDUP(ret, def->title) < 0)
- goto cleanup;
+ return NULL;
break;
case VIR_DOMAIN_METADATA_ELEMENT:
@@ -29748,7 +29743,7 @@ virDomainObjGetMetadata(virDomainObjPtr vm,
break;
if (virXMLExtractNamespaceXML(def->metadata, uri, &ret) < 0)
- goto cleanup;
+ return NULL;
break;
/* coverity[dead_error_begin] */
@@ -29760,7 +29755,6 @@ virDomainObjGetMetadata(virDomainObjPtr vm,
virReportError(VIR_ERR_NO_DOMAIN_METADATA, "%s",
_("Requested metadata element is not present"));
- cleanup:
return ret;
}
@@ -30414,22 +30408,16 @@ static int
virDomainDiskTranslateSourcePoolAuth(virDomainDiskDefPtr def,
virStoragePoolSourcePtr source)
{
- int ret = -1;
-
/* Only necessary when authentication set */
- if (!source->auth) {
- ret = 0;
- goto cleanup;
- }
+ if (!source->auth)
+ return 0;
+
def->src->auth = virStorageAuthDefCopy(source->auth);
if (!def->src->auth)
- goto cleanup;
+ return -1;
/* A <disk> doesn't use <auth type='%s', so clear that out for
the disk */
def->src->auth->authType = VIR_STORAGE_AUTH_TYPE_NONE;
- ret = 0;
-
- cleanup:
- return ret;
+ return 0;
}
@@ -30471,7 +30459,6 @@ int
virDomainDiskTranslateSourcePool(virDomainDiskDefPtr def)
{
virStorageVolInfo info;
- int ret = -1;
VIR_AUTOPTR(virStoragePoolDef) pooldef = NULL;
VIR_AUTOFREE(char *) poolxml = NULL;
VIR_AUTOUNREF(virConnectPtr) conn = NULL;
@@ -30488,27 +30475,27 @@ virDomainDiskTranslateSourcePool(virDomainDiskDefPtr def)
return -1;
if (!(pool = virStoragePoolLookupByName(conn, def->src->srcpool->pool)))
- goto cleanup;
+ return -1;
if (virStoragePoolIsActive(pool) != 1) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("storage pool '%s' containing volume '%s'
"
"is not active"),
def->src->srcpool->pool,
def->src->srcpool->volume);
- goto cleanup;
+ return -1;
}
if (!(vol = virStorageVolLookupByName(pool, def->src->srcpool->volume)))
- goto cleanup;
+ return -1;
if (virStorageVolGetInfo(vol, &info) < 0)
- goto cleanup;
+ return -1;
if (!(poolxml = virStoragePoolGetXMLDesc(pool, 0)))
- goto cleanup;
+ return -1;
if (!(pooldef = virStoragePoolDefParseString(poolxml)))
- goto cleanup;
+ return -1;
def->src->srcpool->pooltype = pooldef->type;
def->src->srcpool->voltype = info.type;
@@ -30517,7 +30504,7 @@ virDomainDiskTranslateSourcePool(virDomainDiskDefPtr def)
virReportError(VIR_ERR_XML_ERROR, "%s",
_("disk source mode is only valid when "
"storage pool is of iscsi type"));
- goto cleanup;
+ return -1;
}
VIR_FREE(def->src->path);
@@ -30537,13 +30524,13 @@ virDomainDiskTranslateSourcePool(virDomainDiskDefPtr def)
case VIR_STORAGE_POOL_ZFS:
case VIR_STORAGE_POOL_VSTORAGE:
if (!(def->src->path = virStorageVolGetPath(vol)))
- goto cleanup;
+ return -1;
if (def->startupPolicy && info.type != VIR_STORAGE_VOL_FILE) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("'startupPolicy' is only valid for "
"'file' type volume"));
- goto cleanup;
+ return -1;
}
@@ -30571,7 +30558,7 @@ virDomainDiskTranslateSourcePool(virDomainDiskDefPtr def)
"for storage pool type '%s'"),
virStorageVolTypeToString(info.type),
virStoragePoolTypeToString(pooldef->type));
- goto cleanup;
+ return -1;
}
break;
@@ -30581,13 +30568,13 @@ virDomainDiskTranslateSourcePool(virDomainDiskDefPtr def)
virReportError(VIR_ERR_XML_ERROR, "%s",
_("'startupPolicy' is only valid for "
"'file' type volume"));
- goto cleanup;
+ return -1;
}
def->src->srcpool->mode = VIR_STORAGE_SOURCE_POOL_MODE_DIRECT;
if (virDomainDiskTranslateISCSIDirect(def, pooldef) < 0)
- goto cleanup;
+ return -1;
break;
@@ -30596,7 +30583,7 @@ virDomainDiskTranslateSourcePool(virDomainDiskDefPtr def)
virReportError(VIR_ERR_XML_ERROR, "%s",
_("'startupPolicy' is only valid for "
"'file' type volume"));
- goto cleanup;
+ return -1;
}
switch (def->src->srcpool->mode) {
@@ -30607,12 +30594,12 @@ virDomainDiskTranslateSourcePool(virDomainDiskDefPtr def)
case VIR_STORAGE_SOURCE_POOL_MODE_HOST:
def->src->srcpool->actualtype = VIR_STORAGE_TYPE_BLOCK;
if (!(def->src->path = virStorageVolGetPath(vol)))
- goto cleanup;
+ return -1;
break;
case VIR_STORAGE_SOURCE_POOL_MODE_DIRECT:
if (virDomainDiskTranslateISCSIDirect(def, pooldef) < 0)
- goto cleanup;
+ return -1;
break;
}
break;
@@ -30626,12 +30613,10 @@ virDomainDiskTranslateSourcePool(virDomainDiskDefPtr def)
_("using '%s' pools for backing 'volume'
disks "
"isn't yet supported"),
virStoragePoolTypeToString(pooldef->type));
- goto cleanup;
+ return -1;
}
- ret = 0;
- cleanup:
- return ret;
+ return 0;
}
--
2.20.1
8:30 a.m.
New subject: [libvirt] [PATCH v3 09/10] conf: Merge with previous
On Fri, Mar 01, 2019 at 11:26:51AM -0500, John Ferlan wrote:
More path cleanup from code review from methods that I didn't
touch
as part of the original set of changes, but Erik called out. Plus now
with the VIR_AUTOUNREF added that meant a couple more modules could be
altered to clean up their return paths.
I will merge with previous once ACK'd
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
src/conf/domain_conf.c | 77 +++++++++++++++++-------------------------
1 file changed, 31 insertions(+), 46 deletions(-)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
10:26 a.m.
New subject: [libvirt] [PATCH v3 10/10] conf: Rework virDomainKeyWrapDefParseXML
Rewrite the code to make usage of some VIR_AUTOFREE logic.
Suggested-by: Erik Skultety <eskultet(a)redhat.com>
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
src/conf/domain_conf.c | 22 ++++++++--------------
1 file changed, 8 insertions(+), 14 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index be6e223e78..05c2c9f34e 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -1170,31 +1170,25 @@ static int
virDomainKeyWrapDefParseXML(virDomainDefPtr def, xmlXPathContextPtr ctxt)
{
size_t i;
- int ret = -1;
int n;
VIR_AUTOFREE(xmlNodePtr *) nodes = NULL;
+ VIR_AUTOFREE(virDomainKeyWrapDefPtr) keywrap = NULL;
if ((n = virXPathNodeSet("./keywrap/cipher", ctxt, &nodes)) < 0)
return n;
- if (VIR_ALLOC(def->keywrap) < 0)
- goto cleanup;
+ if (VIR_ALLOC(keywrap) < 0)
+ return -1;
for (i = 0; i < n; i++) {
- if (virDomainKeyWrapCipherDefParseXML(def->keywrap, nodes[i]) < 0)
- goto cleanup;
+ if (virDomainKeyWrapCipherDefParseXML(keywrap, nodes[i]) < 0)
+ return -1;
}
- if (!def->keywrap->aes &&
- !def->keywrap->dea)
- VIR_FREE(def->keywrap);
+ if (keywrap->aes || keywrap->dea)
+ VIR_STEAL_PTR(def->keywrap, keywrap);
- ret = 0;
-
- cleanup:
- if (ret < 0)
- VIR_FREE(def->keywrap);
- return ret;
+ return 0;
}
--
2.20.1
8:41 a.m.
New subject: [libvirt] [PATCH v3 10/10] conf: Rework virDomainKeyWrapDefParseXML
On Fri, Mar 01, 2019 at 11:26:52AM -0500, John Ferlan wrote:
Rewrite the code to make usage of some VIR_AUTOFREE logic.
Suggested-by: Erik Skultety <eskultet(a)redhat.com>
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
src/conf/domain_conf.c | 22 ++++++++--------------
1 file changed, 8 insertions(+), 14 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index be6e223e78..05c2c9f34e 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -1170,31 +1170,25 @@ static int
virDomainKeyWrapDefParseXML(virDomainDefPtr def, xmlXPathContextPtr ctxt)
{
size_t i;
- int ret = -1;
int n;
VIR_AUTOFREE(xmlNodePtr *) nodes = NULL;
+ VIR_AUTOFREE(virDomainKeyWrapDefPtr) keywrap = NULL;
if ((n = virXPathNodeSet("./keywrap/cipher", ctxt, &nodes)) < 0)
return n;
- if (VIR_ALLOC(def->keywrap) < 0)
- goto cleanup;
+ if (VIR_ALLOC(keywrap) < 0)
+ return -1;
for (i = 0; i < n; i++) {
- if (virDomainKeyWrapCipherDefParseXML(def->keywrap, nodes[i]) < 0)
- goto cleanup;
+ if (virDomainKeyWrapCipherDefParseXML(keywrap, nodes[i]) < 0)
+ return -1;
}
- if (!def->keywrap->aes &&
- !def->keywrap->dea)
- VIR_FREE(def->keywrap);
+ if (keywrap->aes || keywrap->dea)
+ VIR_STEAL_PTR(def->keywrap, keywrap);
This is an odd condition (but preserving existing oddness)
For any invalid or duplicate <cipher> elements virDomainKeyWrapCipherDefParseXML
would return an error, so the only way to get here without satisfying
the conditions is when n = 0.
But the patch itself is correct.
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
- ret = 0;
-
- cleanup:
- if (ret < 0)
- VIR_FREE(def->keywrap);
- return ret;
+ return 0;
2:13 a.m.
On Fri, Mar 01, 2019 at 11:26:42AM -0500, John Ferlan wrote:
v2:
https://www.redhat.com/archives/libvir-list/2019-February/msg01201.html
Changes since v2:
Patches 1-5 are marked w/ reviewed-by
Added patch 6 to add a few more VIR_AUTOFREE on char *'s that I missed
in the first passes - these would be merged with previous after a
successful review.
Added patch 7 to add VIR_AUTOUNREF.
Patch 8 is unchanged from previous patch 6
Patch 9 is more places where cleanup could occur from code review and
from the VIR_AUTOUNREF change
Patch 10 is a change to virDomainKeyWrapDefParseXML as requested as part
of the code review
Other requests for more VIR_AUTOPTR usage should be done right and at
a later point.
Usage of VIR_XPATH_NODE_AUTORESTORE would also have to wait since
those changes aren't pushed yet, but that could lead to *a lot* more
cleanup in domain_conf.
Reviewed-by: Erik Skultety <eskultet(a)redhat.com>
2090
days inactive
2093
days old
21 comments
3 participants
participants (3)
-
Erik Skultety -
John Ferlan -
Ján Tomko