mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-30 18:03:32 +00:00
vbox: 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: Cole Robinson <crobinso@redhat.com> Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
This commit is contained in:
parent
cee3a900a0
commit
290c1ea733
@ -69,18 +69,18 @@ static virDomainDefParserConfig vboxDomainDefParserConfig = {
|
|||||||
static virCapsPtr
|
static virCapsPtr
|
||||||
vboxCapsInit(void)
|
vboxCapsInit(void)
|
||||||
{
|
{
|
||||||
virCapsPtr caps;
|
g_autoptr(virCaps) caps = NULL;
|
||||||
virCapsGuestPtr guest;
|
virCapsGuestPtr guest = NULL;
|
||||||
|
|
||||||
if ((caps = virCapabilitiesNew(virArchFromHost(),
|
if ((caps = virCapabilitiesNew(virArchFromHost(),
|
||||||
false, false)) == NULL)
|
false, false)) == NULL)
|
||||||
goto no_memory;
|
return NULL;
|
||||||
|
|
||||||
if (!(caps->host.numa = virCapabilitiesHostNUMANewHost()))
|
if (!(caps->host.numa = virCapabilitiesHostNUMANewHost()))
|
||||||
goto no_memory;
|
return NULL;
|
||||||
|
|
||||||
if (virCapabilitiesInitCaches(caps) < 0)
|
if (virCapabilitiesInitCaches(caps) < 0)
|
||||||
goto no_memory;
|
return NULL;
|
||||||
|
|
||||||
if ((guest = virCapabilitiesAddGuest(caps,
|
if ((guest = virCapabilitiesAddGuest(caps,
|
||||||
VIR_DOMAIN_OSTYPE_HVM,
|
VIR_DOMAIN_OSTYPE_HVM,
|
||||||
@ -89,7 +89,7 @@ vboxCapsInit(void)
|
|||||||
NULL,
|
NULL,
|
||||||
0,
|
0,
|
||||||
NULL)) == NULL)
|
NULL)) == NULL)
|
||||||
goto no_memory;
|
return NULL;
|
||||||
|
|
||||||
if (virCapabilitiesAddGuestDomain(guest,
|
if (virCapabilitiesAddGuestDomain(guest,
|
||||||
VIR_DOMAIN_VIRT_VBOX,
|
VIR_DOMAIN_VIRT_VBOX,
|
||||||
@ -97,13 +97,9 @@ vboxCapsInit(void)
|
|||||||
NULL,
|
NULL,
|
||||||
0,
|
0,
|
||||||
NULL) == NULL)
|
NULL) == NULL)
|
||||||
goto no_memory;
|
|
||||||
|
|
||||||
return caps;
|
|
||||||
|
|
||||||
no_memory:
|
|
||||||
virObjectUnref(caps);
|
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
|
return g_steal_pointer(&caps);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
Loading…
Reference in New Issue
Block a user