提交 e1d7273f 编写于 作者: J Ján Tomko

Simplify virDomainParseMemory

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

Delete the cleanup label, there is nothing to clean up.
上级 598927a5
...@@ -7584,28 +7584,22 @@ virDomainParseMemory(const char *xpath, ...@@ -7584,28 +7584,22 @@ virDomainParseMemory(const char *xpath,
bool required, bool required,
bool capped) bool capped)
{ {
int ret = -1;
unsigned long long bytes, max; unsigned long long bytes, max;
max = virMemoryMaxValue(capped); max = virMemoryMaxValue(capped);
ret = virDomainParseScaledValue(xpath, units_xpath, ctxt, if (virDomainParseScaledValue(xpath, units_xpath, ctxt,
&bytes, 1024, max, required); &bytes, 1024, max, required) < 0)
if (ret < 0) return -1;
goto cleanup;
/* Yes, we really do use kibibytes for our internal sizing. */ /* Yes, we really do use kibibytes for our internal sizing. */
*mem = VIR_DIV_UP(bytes, 1024); *mem = VIR_DIV_UP(bytes, 1024);
if (*mem >= VIR_DIV_UP(max, 1024)) { if (*mem >= VIR_DIV_UP(max, 1024)) {
virReportError(VIR_ERR_OVERFLOW, "%s", _("size value too large")); virReportError(VIR_ERR_OVERFLOW, "%s", _("size value too large"));
ret = -1; return -1;
goto cleanup;
} }
return 0;
ret = 0;
cleanup:
return ret;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册