From 8690caf5d4ce303f03eb9193858c27f706cfac36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Mon, 13 Dec 2021 19:00:53 +0100 Subject: [PATCH] openvz: refactor openvzSetInitialConfig 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 | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index efd334a235..c4fa83f4c6 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -142,14 +142,12 @@ openvzDomainDefineCmd(virDomainDef *vmdef) static int openvzSetInitialConfig(virDomainDef *vmdef) { - int ret = -1; int vpsid; - virCommand *cmd = NULL; if (vmdef->nfss > 1) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("only one filesystem supported")); - goto cleanup; + return -1; } if (vmdef->nfss == 1 && @@ -158,7 +156,7 @@ static int openvzSetInitialConfig(virDomainDef *vmdef) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("filesystem is not of type 'template' or 'mount'")); - goto cleanup; + return -1; } @@ -169,32 +167,27 @@ static int openvzSetInitialConfig(virDomainDef *vmdef) if (virStrToLong_i(vmdef->name, NULL, 10, &vpsid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not convert domain name to VEID")); - goto cleanup; + return -1; } if (openvzCopyDefaultConfig(vpsid) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not copy default config")); - goto cleanup; + return -1; } if (openvzWriteVPSConfigParam(vpsid, "VE_PRIVATE", vmdef->fss[0]->src->path) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not set the source dir for the filesystem")); - goto cleanup; + return -1; } } else { - cmd = openvzDomainDefineCmd(vmdef); + g_autoptr(virCommand) cmd = openvzDomainDefineCmd(vmdef); if (virCommandRun(cmd, NULL) < 0) - goto cleanup; + return -1; } - ret = 0; - - cleanup: - virCommandFree(cmd); - - return ret; + return 0; }