External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 07:59:00 +00:00
Code

Remove double OOM error reporting

Browse Source
This commit is contained in:
Ján Tomko 2014-06-27 08:44:15 +02:00
parent fb11f5b185
commit 5656d9bb7a
4 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/libxl/libxl_driver.c
View File

@ -3983,11 +3983,12 @@ libxlDomainGetNumaParameters(virDomainPtr dom,
if (numnodes <= 0) if (numnodes <= 0)
goto cleanup; goto cleanup;
if (libxl_node_bitmap_alloc(priv->ctx, &nodemap, 0) || if (libxl_node_bitmap_alloc(priv->ctx, &nodemap, 0)) {
!(nodes = virBitmapNew(numnodes))) {
virReportOOMError(); virReportOOMError();
goto cleanup; goto cleanup;
} }
if (!(nodes = virBitmapNew(numnodes)))
goto cleanup;
rc = libxl_domain_get_nodeaffinity(priv->ctx, rc = libxl_domain_get_nodeaffinity(priv->ctx,
vm->def->id, vm->def->id,

8
src/qemu/qemu_command.c
View File

@ -9113,10 +9113,8 @@ qemuBuildParallelChrDeviceStr(char **deviceStr,
virDomainChrDefPtr chr) virDomainChrDefPtr chr)
{ {
if (virAsprintf(deviceStr, "isa-parallel,chardev=char%s,id=%s", if (virAsprintf(deviceStr, "isa-parallel,chardev=char%s,id=%s",
chr->info.alias, chr->info.alias) < 0) { chr->info.alias, chr->info.alias) < 0)
virReportOOMError();
return -1; return -1;
}
return 0; return 0;
} }
@ -9139,10 +9137,8 @@ qemuBuildChannelChrDeviceStr(char **deviceStr,
if (virAsprintf(deviceStr, if (virAsprintf(deviceStr,
"user,guestfwd=tcp:%s:%i-chardev:char%s,id=user-%s", "user,guestfwd=tcp:%s:%i-chardev:char%s,id=user-%s",
addr, port, chr->info.alias, chr->info.alias) < 0) { addr, port, chr->info.alias, chr->info.alias) < 0)
virReportOOMError();
goto cleanup; goto cleanup;
}
break; break;
case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO: case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO:

4
src/qemu/qemu_hotplug.c
View File

@ -1450,10 +1450,8 @@ int qemuDomainAttachChrDevice(virQEMUDriverPtr driver,
if (qemuBuildChrDeviceStr(&devstr, vm->def, chr, priv->qemuCaps) < 0) if (qemuBuildChrDeviceStr(&devstr, vm->def, chr, priv->qemuCaps) < 0)
return ret; return ret;
if (virAsprintf(&charAlias, "char%s", chr->info.alias) < 0) { if (virAsprintf(&charAlias, "char%s", chr->info.alias) < 0)
virReportOOMError();
goto cleanup; goto cleanup;
}
if (qemuDomainChrInsert(vmdef, chr) < 0) if (qemuDomainChrInsert(vmdef, chr) < 0)
goto cleanup; goto cleanup;

2
src/util/viruri.c
View File

@ -120,7 +120,7 @@ virURIParseParams(virURIPtr uri)
if (virURIParamAppend(uri, name, value ? value : "") < 0) { if (virURIParamAppend(uri, name, value ? value : "") < 0) {
VIR_FREE(name); VIR_FREE(name);
VIR_FREE(value); VIR_FREE(value);
goto no_memory; return -1;
} }
VIR_FREE(name); VIR_FREE(name);
VIR_FREE(value); VIR_FREE(value);