openvz: refactor openvzGetVEStatus

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:26:06 +01:00
parent 783e0b9c8e
commit c5ae8135df

View File

@ -1697,21 +1697,20 @@ openvzDomainSetMemoryParameters(virDomainPtr domain,
static int static int
openvzGetVEStatus(virDomainObj *vm, int *status, int *reason) openvzGetVEStatus(virDomainObj *vm, int *status, int *reason)
{ {
virCommand *cmd; g_autoptr(virCommand) cmd = NULL;
char *outbuf; g_autofree char *outbuf = NULL;
char *line; char *line;
int state; int state;
int ret = -1;
cmd = virCommandNewArgList(VZLIST, vm->def->name, "-ostatus", "-H", NULL); cmd = virCommandNewArgList(VZLIST, vm->def->name, "-ostatus", "-H", NULL);
virCommandSetOutputBuffer(cmd, &outbuf); virCommandSetOutputBuffer(cmd, &outbuf);
if (virCommandRun(cmd, NULL) < 0) if (virCommandRun(cmd, NULL) < 0)
goto cleanup; return -1;
if ((line = strchr(outbuf, '\n')) == NULL) { if ((line = strchr(outbuf, '\n')) == NULL) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Failed to parse vzlist output")); _("Failed to parse vzlist output"));
goto cleanup; return -1;
} }
*line++ = '\0'; *line++ = '\0';
@ -1728,12 +1727,7 @@ openvzGetVEStatus(virDomainObj *vm, int *status, int *reason)
*status = VIR_DOMAIN_SHUTOFF; *status = VIR_DOMAIN_SHUTOFF;
} }
ret = 0; return 0;
cleanup:
virCommandFree(cmd);
VIR_FREE(outbuf);
return ret;
} }
static int static int