[libvirt] [PATCH 2/5] openvz: Get rid of "no_memory" labels
As pointed out by Ján Tomko, "no_memory seems suspicious in the times of
abort()".
As libvirt decided to take the path to not report OOM and simply abort
when it happens, let's get rid of the no_memory labels and simplify the
code around them.
Signed-off-by: Fabiano Fidêncio <fidencio(a)redhat.com>
---
src/openvz/openvz_conf.c | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c
index 971adaf71c..c4c6dec2f7 100644
--- a/src/openvz/openvz_conf.c
+++ b/src/openvz/openvz_conf.c
@@ -148,18 +148,18 @@ openvzParseBarrierLimit(const char* value,
virCapsPtr openvzCapsInit(void)
{
- virCapsPtr caps;
+ g_autoptr(virCaps) caps = NULL;
virCapsGuestPtr guest;
if ((caps = virCapabilitiesNew(virArchFromHost(),
false, false)) == NULL)
- goto no_memory;
+ return NULL;
if (!(caps->host.numa = virCapabilitiesHostNUMANewHost()))
- goto no_memory;
+ return NULL;
if (virCapabilitiesInitCaches(caps) < 0)
- goto no_memory;
+ return NULL;
if ((guest = virCapabilitiesAddGuest(caps,
VIR_DOMAIN_OSTYPE_EXE,
@@ -168,7 +168,7 @@ virCapsPtr openvzCapsInit(void)
NULL,
0,
NULL)) == NULL)
- goto no_memory;
+ return NULL;
if (virCapabilitiesAddGuestDomain(guest,
VIR_DOMAIN_VIRT_OPENVZ,
@@ -176,13 +176,9 @@ virCapsPtr openvzCapsInit(void)
NULL,
0,
NULL) == NULL)
- goto no_memory;
+ return NULL;
- return caps;
-
- no_memory:
- virObjectUnref(caps);
- return NULL;
+ return g_steal_pointer(&caps);
}
--
2.24.1