]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
libxl: remove redundant calls to virObjectEventStateQueue
authorJim Fehlig <jfehlig@suse.com>
Wed, 31 Oct 2018 16:41:28 +0000 (10:41 -0600)
committerJim Fehlig <jfehlig@suse.com>
Tue, 6 Nov 2018 16:06:45 +0000 (09:06 -0700)
In libxlDomainShutdownThread, virObjectEventStateQueue is needlessly
called in the destroy and restart labels. The cleanup label aready
queues whatever event was created based on libxl_shutdown_reason.
There is no need to handle destroy and restart differently.

Signed-off-by: Jim Fehlig <jfehlig@suse.com>
ACKed-by: Michal Privoznik <mprivozn@redhat.com>
src/libxl/libxl_domain.c

index 0032b9dd11f8ee97e99dc081fddb10ee09a4d2e9..9ed6ee8fb33f0945163b22c26cc76b1e7e8a39d5 100644 (file)
@@ -538,8 +538,6 @@ libxlDomainShutdownThread(void *opaque)
     }
 
  destroy:
-    virObjectEventStateQueue(driver->domainEventState, dom_event);
-    dom_event = NULL;
     libxlDomainDestroyInternal(driver, vm);
     libxlDomainCleanup(driver, vm);
     if (!vm->persistent)
@@ -548,8 +546,6 @@ libxlDomainShutdownThread(void *opaque)
     goto endjob;
 
  restart:
-    virObjectEventStateQueue(driver->domainEventState, dom_event);
-    dom_event = NULL;
     libxlDomainDestroyInternal(driver, vm);
     libxlDomainCleanup(driver, vm);
     if (libxlDomainStartNew(driver, vm, false) < 0) {