From 7987780779be5f0121e558d94cc3318eefeeb159 Mon Sep 17 00:00:00 2001 From: Clementine Hayat Date: Tue, 17 Apr 2018 22:13:32 +0000 Subject: [PATCH] openvz: start using virDomainObjCheckActive MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Clementine Hayat Reviewed-by: Ján Tomko Signed-off-by: Ján Tomko --- src/openvz/openvz_driver.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 84eea56e1c..ba5ad8eeb4 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -571,11 +571,8 @@ static int openvzDomainSuspend(virDomainPtr dom) if (!(vm = openvzDomObjFromDomain(driver, dom->uuid))) return -1; - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("Domain is not running")); + if (virDomainObjCheckActive(vm) < 0) goto cleanup; - } if (virDomainObjGetState(vm, NULL) != VIR_DOMAIN_PAUSED) { openvzSetProgramSentinal(prog, vm->def->name); @@ -601,11 +598,8 @@ static int openvzDomainResume(virDomainPtr dom) if (!(vm = openvzDomObjFromDomain(driver, dom->uuid))) return -1; - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("Domain is not running")); + if (virDomainObjCheckActive(vm) < 0) goto cleanup; - } if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_PAUSED) { openvzSetProgramSentinal(prog, vm->def->name); @@ -1891,11 +1885,8 @@ openvzDomainInterfaceStats(virDomainPtr dom, if (!(vm = openvzDomObjFromDomain(driver, dom->uuid))) return -1; - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("domain is not running")); + if (virDomainObjCheckActive(vm) < 0) goto cleanup; - } if (!(net = virDomainNetFind(vm->def, device))) goto cleanup; @@ -2131,11 +2122,8 @@ openvzDomainMigrateBegin3Params(virDomainPtr domain, if (!(vm = openvzDomObjFromDomain(driver, domain->uuid))) return NULL; - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("domain is not running")); + if (virDomainObjCheckActive(vm) < 0) goto cleanup; - } if (openvzGetVEStatus(vm, &status, NULL) == -1) goto cleanup;