[libvirt PATCH 06/20] openvz: refactor openvzSetDiskQuota
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/openvz/openvz_driver.c | 21 ++++++++-------------
1 file changed, 8 insertions(+), 13 deletions(-)
diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index c4fa83f4c6..073de66611 100644
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -196,13 +196,12 @@ openvzSetDiskQuota(virDomainDef *vmdef,
virDomainFSDef *fss,
bool persist)
{
- int ret = -1;
unsigned long long sl, hl;
- virCommand *cmd = virCommandNewArgList(VZCTL,
- "--quiet",
- "set",
- vmdef->name,
- NULL);
+ g_autoptr(virCommand) cmd = virCommandNewArgList(VZCTL,
+ "--quiet",
+ "set",
+ vmdef->name,
+ NULL);
if (persist)
virCommandAddArg(cmd, "--save");
@@ -220,18 +219,14 @@ openvzSetDiskQuota(virDomainDef *vmdef,
} else if (fss->space_soft_limit) {
virReportError(VIR_ERR_INVALID_ARG, "%s",
_("Can't set soft limit without hard limit"));
- goto cleanup;
+ return -1;
}
if (virCommandRun(cmd, NULL) < 0)
- goto cleanup;
+ return -1;
}
- ret = 0;
- cleanup:
- virCommandFree(cmd);
-
- return ret;
+ return 0;
}
--
2.31.1