]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
openvz: start using virDomainObjCheckActive
authorClementine Hayat <clem@lse.epita.fr>
Tue, 17 Apr 2018 22:13:32 +0000 (22:13 +0000)
committerJán Tomko <jtomko@redhat.com>
Wed, 18 Apr 2018 08:22:07 +0000 (10:22 +0200)
Signed-off-by: Clementine Hayat <clem@lse.epita.fr>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
src/openvz/openvz_driver.c

index 84eea56e1c7ca5537c07529d73348deecfc4634f..ba5ad8eeb478f7c276c56d892ab30fdce3b3fb4f 100644 (file)
@@ -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;