提交 e08cc72e 编写于 作者: F Fabiano Fidêncio 提交者: Cole Robinson

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.
Reviewed-by: NCole Robinson <crobinso@redhat.com>
Signed-off-by: NFabiano Fidêncio <fidencio@redhat.com>
上级 ca49b6ec
......@@ -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);
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册