mirror of
https://github.com/libvirt/libvirt.git
synced 2025-02-25 18:55:26 -06:00
qemuBuildHotpluggableCPUProps: use VIR_RETURN_PTR
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:
parent
f9f50270ba
commit
ba93e3a228
@ -11047,33 +11047,29 @@ virJSONValuePtr
|
|||||||
qemuBuildHotpluggableCPUProps(const virDomainVcpuDef *vcpu)
|
qemuBuildHotpluggableCPUProps(const virDomainVcpuDef *vcpu)
|
||||||
{
|
{
|
||||||
qemuDomainVcpuPrivatePtr vcpupriv = QEMU_DOMAIN_VCPU_PRIVATE(vcpu);
|
qemuDomainVcpuPrivatePtr vcpupriv = QEMU_DOMAIN_VCPU_PRIVATE(vcpu);
|
||||||
virJSONValuePtr ret = NULL;
|
VIR_AUTOPTR(virJSONValue) ret = NULL;
|
||||||
|
|
||||||
if (virJSONValueObjectCreate(&ret, "s:driver", vcpupriv->type,
|
if (virJSONValueObjectCreate(&ret, "s:driver", vcpupriv->type,
|
||||||
"s:id", vcpupriv->alias, NULL) < 0)
|
"s:id", vcpupriv->alias, NULL) < 0)
|
||||||
goto error;
|
return NULL;
|
||||||
|
|
||||||
if (vcpupriv->socket_id != -1 &&
|
if (vcpupriv->socket_id != -1 &&
|
||||||
virJSONValueObjectAdd(ret, "i:socket-id", vcpupriv->socket_id, NULL) < 0)
|
virJSONValueObjectAdd(ret, "i:socket-id", vcpupriv->socket_id, NULL) < 0)
|
||||||
goto error;
|
return NULL;
|
||||||
|
|
||||||
if (vcpupriv->core_id != -1 &&
|
if (vcpupriv->core_id != -1 &&
|
||||||
virJSONValueObjectAdd(ret, "i:core-id", vcpupriv->core_id, NULL) < 0)
|
virJSONValueObjectAdd(ret, "i:core-id", vcpupriv->core_id, NULL) < 0)
|
||||||
goto error;
|
return NULL;
|
||||||
|
|
||||||
if (vcpupriv->thread_id != -1 &&
|
if (vcpupriv->thread_id != -1 &&
|
||||||
virJSONValueObjectAdd(ret, "i:thread-id", vcpupriv->thread_id, NULL) < 0)
|
virJSONValueObjectAdd(ret, "i:thread-id", vcpupriv->thread_id, NULL) < 0)
|
||||||
goto error;
|
return NULL;
|
||||||
|
|
||||||
if (vcpupriv->node_id != -1 &&
|
if (vcpupriv->node_id != -1 &&
|
||||||
virJSONValueObjectAdd(ret, "i:node-id", vcpupriv->node_id, NULL) < 0)
|
virJSONValueObjectAdd(ret, "i:node-id", vcpupriv->node_id, NULL) < 0)
|
||||||
goto error;
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
|
|
||||||
error:
|
|
||||||
virJSONValueFree(ret);
|
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
|
VIR_RETURN_PTR(ret);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user