External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-17 15:17:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

vbox: Get rid of "no_memory" labels

Browse Source 
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: Cole Robinson <crobinso@redhat.com>
Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
This commit is contained in:
Fabiano Fidêncio 2019-12-20 13:43:15 +01:00 committed by Cole Robinson
parent cee3a900a0
commit 290c1ea733
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/vbox/vbox_common.c
View File

@ -69,18 +69,18 @@ static virDomainDefParserConfig vboxDomainDefParserConfig = {
static virCapsPtr
vboxCapsInit(void)
{
virCapsPtr caps;
virCapsGuestPtr guest;
g_autoptr(virCaps) caps = NULL;
virCapsGuestPtr guest = NULL;
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_HVM,
@ -89,7 +89,7 @@ vboxCapsInit(void)
NULL,
0,
NULL)) == NULL)
goto no_memory;
return NULL;
if (virCapabilitiesAddGuestDomain(guest,
VIR_DOMAIN_VIRT_VBOX,
@ -97,13 +97,9 @@ vboxCapsInit(void)
NULL,
0,
NULL) == NULL)
goto no_memory;
return NULL;
return caps;
no_memory:
virObjectUnref(caps);
return NULL;
return g_steal_pointer(&caps);
}
static void