External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-17 15:17:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

openvz: refactor openvzSetInitialConfig

Browse Source 
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Ján Tomko 2021-12-13 19:00:53 +01:00
parent 560de4e5cd
commit 8690caf5d4
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/openvz/openvz_driver.c
View File

@ -142,14 +142,12 @@ openvzDomainDefineCmd(virDomainDef *vmdef)
static int openvzSetInitialConfig(virDomainDef *vmdef) static int openvzSetInitialConfig(virDomainDef *vmdef)
{ {
int ret = -1;
int vpsid; int vpsid;
virCommand *cmd = NULL;
if (vmdef->nfss > 1) { if (vmdef->nfss > 1) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("only one filesystem supported")); _("only one filesystem supported"));
goto cleanup; return -1;
} }
if (vmdef->nfss == 1 && if (vmdef->nfss == 1 &&
@ -158,7 +156,7 @@ static int openvzSetInitialConfig(virDomainDef *vmdef)
{ {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("filesystem is not of type 'template' or 'mount'")); _("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) { if (virStrToLong_i(vmdef->name, NULL, 10, &vpsid) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Could not convert domain name to VEID")); _("Could not convert domain name to VEID"));
goto cleanup; return -1;
} }
if (openvzCopyDefaultConfig(vpsid) < 0) { if (openvzCopyDefaultConfig(vpsid) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Could not copy default config")); _("Could not copy default config"));
goto cleanup; return -1;
} }
if (openvzWriteVPSConfigParam(vpsid, "VE_PRIVATE", vmdef->fss[0]->src->path) < 0) { if (openvzWriteVPSConfigParam(vpsid, "VE_PRIVATE", vmdef->fss[0]->src->path) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Could not set the source dir for the filesystem")); _("Could not set the source dir for the filesystem"));
goto cleanup; return -1;
} }
} else { } else {
cmd = openvzDomainDefineCmd(vmdef); g_autoptr(virCommand) cmd = openvzDomainDefineCmd(vmdef);
if (virCommandRun(cmd, NULL) < 0) if (virCommandRun(cmd, NULL) < 0)
goto cleanup; return -1;
} }
ret = 0; return 0;
cleanup:
virCommandFree(cmd);
return ret;
} }