]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
vz: don't fail unregister on sending event error
authorNikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
Tue, 14 Jun 2016 08:46:00 +0000 (11:46 +0300)
committerMaxim Nestratov <mnestratov@virtuozzo.com>
Tue, 19 Jul 2016 02:31:17 +0000 (05:31 +0300)
Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
src/vz/vz_sdk.c

index 0662be12806395ba3be091dbaca147b94055a0e2..d04c456f6ccd0fddf04d25fcf5b6bb240569e62c 100644 (file)
@@ -1882,21 +1882,19 @@ prlsdkUpdateDomain(vzDriverPtr driver, virDomainObjPtr dom)
     return prlsdkLoadDomain(driver, pdom->sdkdom, dom) ? 0 : -1;
 }
 
-static int prlsdkSendEvent(vzDriverPtr driver,
-                           virDomainObjPtr dom,
-                           virDomainEventType lvEventType,
-                           int lvEventTypeDetails)
+static void
+prlsdkSendEvent(vzDriverPtr driver,
+                virDomainObjPtr dom,
+                virDomainEventType lvEventType,
+                int lvEventTypeDetails)
 {
-    virObjectEventPtr event = NULL;
+    virObjectEventPtr event;
 
     event = virDomainEventLifecycleNewFromObj(dom,
                                               lvEventType,
                                               lvEventTypeDetails);
-    if (!event)
-        return -1;
-
-    virObjectEventStateQueue(driver->domainEventState, event);
-    return 0;
+    if (event)
+        virObjectEventStateQueue(driver->domainEventState, event);
 }
 
 static void
@@ -4102,9 +4100,8 @@ prlsdkUnregisterDomain(vzDriverPtr driver, virDomainObjPtr dom, unsigned int fla
     for (i = 0; i < dom->def->nnets; i++)
         prlsdkCleanupBridgedNet(driver, dom->def->nets[i]);
 
-    if (prlsdkSendEvent(driver, dom, VIR_DOMAIN_EVENT_UNDEFINED,
-                        VIR_DOMAIN_EVENT_UNDEFINED_REMOVED) < 0)
-        goto cleanup;
+    prlsdkSendEvent(driver, dom, VIR_DOMAIN_EVENT_UNDEFINED,
+                    VIR_DOMAIN_EVENT_UNDEFINED_REMOVED);
 
     virDomainObjListRemove(driver->domains, dom);