From: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
Date: Tue, 3 Nov 2020 07:53:57 +0000 (+0300)
Subject: qemu: rename: send events only on success
X-Git-Tag: v6.10.0-rc1~191
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9a5ac61c4ee39fbd33cfc3ddd6d94e6f4e003152;p=thirdparty%2Flibvirt.git

qemu: rename: send events only on success

We can simplify cleanup section by moving sending events to success path only
because only on sucess path events are not NULL.

Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 9b61e952c1..7817564c1c 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -19179,11 +19179,11 @@ qemuDomainRenameCallback(virDomainObjPtr vm,
     event_new = virDomainEventLifecycleNewFromObj(vm,
                                               VIR_DOMAIN_EVENT_DEFINED,
                                               VIR_DOMAIN_EVENT_DEFINED_RENAMED);
+    virObjectEventStateQueue(driver->domainEventState, event_old);
+    virObjectEventStateQueue(driver->domainEventState, event_new);
     ret = 0;
 
  cleanup:
-    virObjectEventStateQueue(driver->domainEventState, event_old);
-    virObjectEventStateQueue(driver->domainEventState, event_new);
     return ret;
 
  rollback: