From: Jim Fehlig <jfehlig@suse.com>
Date: Wed, 31 Oct 2018 16:41:28 +0000 (-0600)
Subject: libxl: remove redundant calls to virObjectEventStateQueue
X-Git-Tag: v4.10.0-rc1~137
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14d03b27bf8f8a13da27a297e23e2b1b80688459;p=thirdparty%2Flibvirt.git

libxl: remove redundant calls to virObjectEventStateQueue

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>
---

diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
index 0032b9dd11..9ed6ee8fb3 100644
--- a/src/libxl/libxl_domain.c
+++ b/src/libxl/libxl_domain.c
@@ -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) {