shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-04 21:47:16 +03:00
Code Releases Activity

qemuBuildHotpluggableCPUProps: use VIR_RETURN_PTR

Browse Source 
This lets us get rid of the error label.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Ján Tomko 2019-08-20 12:40:09 +02:00
parent f9f50270ba
commit ba93e3a228
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/qemu/qemu_command.c
View File

@ -11047,33 +11047,29 @@ virJSONValuePtr
qemuBuildHotpluggableCPUProps(const virDomainVcpuDef *vcpu)
{
qemuDomainVcpuPrivatePtr vcpupriv = QEMU_DOMAIN_VCPU_PRIVATE(vcpu);
virJSONValuePtr ret = NULL;
VIR_AUTOPTR(virJSONValue) ret = NULL;
if (virJSONValueObjectCreate(&ret, "s:driver", vcpupriv->type,
"s:id", vcpupriv->alias, NULL) < 0)
goto error;
return NULL;
if (vcpupriv->socket_id != -1 &&
virJSONValueObjectAdd(ret, "i:socket-id", vcpupriv->socket_id, NULL) < 0)
goto error;
return NULL;
if (vcpupriv->core_id != -1 &&
virJSONValueObjectAdd(ret, "i:core-id", vcpupriv->core_id, NULL) < 0)
goto error;
return NULL;
if (vcpupriv->thread_id != -1 &&
virJSONValueObjectAdd(ret, "i:thread-id", vcpupriv->thread_id, NULL) < 0)
goto error;
return NULL;
if (vcpupriv->node_id != -1 &&
virJSONValueObjectAdd(ret, "i:node-id", vcpupriv->node_id, NULL) < 0)
goto error;
return NULL;
return ret;
error:
virJSONValueFree(ret);
return NULL;
VIR_RETURN_PTR(ret);
}