External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-05 05:45:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify virDomainParseMemory

Browse Source 
Do not store the return value of virDomainParseScaledValue,
it was overwritten anyway.

Delete the cleanup label, there is nothing to clean up.
This commit is contained in:
Ján Tomko 2016-01-29 18:00:13 +01:00
parent 598927a5bc
commit e1d7273f24
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/conf/domain_conf.c
View File

@ -7584,28 +7584,22 @@ virDomainParseMemory(const char *xpath,
bool required,
bool capped)
{
int ret = -1;
unsigned long long bytes, max;
max = virMemoryMaxValue(capped);
ret = virDomainParseScaledValue(xpath, units_xpath, ctxt,
&bytes, 1024, max, required);
if (ret < 0)
goto cleanup;
if (virDomainParseScaledValue(xpath, units_xpath, ctxt,
&bytes, 1024, max, required) < 0)
return -1;
/* Yes, we really do use kibibytes for our internal sizing. */
*mem = VIR_DIV_UP(bytes, 1024);
if (*mem >= VIR_DIV_UP(max, 1024)) {
virReportError(VIR_ERR_OVERFLOW, "%s", _("size value too large"));
ret = -1;
goto cleanup;
return -1;
}
ret = 0;
cleanup:
return ret;
return 0;
}