From: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
Date: Tue, 3 Nov 2020 07:28:57 +0000 (+0300)
Subject: qemu: qemuDomainRenameCallback: fix sending false undefined event
X-Git-Tag: v6.10.0-rc1~192
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8afbd34ba930fd442699e9a1699067db332eb946;p=thirdparty%2Flibvirt.git

qemu: qemuDomainRenameCallback: fix sending false undefined event

For example if saving config file with new name fails we send false undefine
event currently.

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 05f8eb2cb7..9b61e952c1 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -19147,10 +19147,6 @@ qemuDomainRenameCallback(virDomainObjPtr vm,
         }
     }
 
-    event_old = virDomainEventLifecycleNewFromObj(vm,
-                                            VIR_DOMAIN_EVENT_UNDEFINED,
-                                            VIR_DOMAIN_EVENT_UNDEFINED_RENAMED);
-
     /* Switch name in domain definition. */
     old_dom_name = vm->def->name;
     vm->def->name = new_dom_name;
@@ -19177,6 +19173,9 @@ qemuDomainRenameCallback(virDomainObjPtr vm,
         }
     }
 
+    event_old = virDomainEventLifecycleNew(vm->def->id, old_dom_name, vm->def->uuid,
+                                           VIR_DOMAIN_EVENT_UNDEFINED,
+                                           VIR_DOMAIN_EVENT_UNDEFINED_RENAMED);
     event_new = virDomainEventLifecycleNewFromObj(vm,
                                               VIR_DOMAIN_EVENT_DEFINED,
                                               VIR_DOMAIN_EVENT_DEFINED_RENAMED);