From 83b063ca607a27a03bdd178fccec926ac870cbfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Mon, 13 Dec 2021 19:06:11 +0100 Subject: [PATCH] openvz: refactor openvzSetDiskQuota MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ján Tomko Reviewed-by: Michal Privoznik --- 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; }