forked from pool/libvirt
0a997d39fb
- libxl: add support for soft reset 14d03b27-libxl-rm-redundant-virObjectEventStateQueue.patch, 82452a5d-libxl-rm-goto-libxlDomainShutdownThread.patch, da4b0fd9-libxl-support-soft-reset.patch bsc#1081516 OBS-URL: https://build.opensuse.org/request/show/647056 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=716
37 lines
1.3 KiB
Diff
37 lines
1.3 KiB
Diff
commit 14d03b27bf8f8a13da27a297e23e2b1b80688459
|
|
Author: Jim Fehlig <jfehlig@suse.com>
|
|
Date: Wed Oct 31 10:41:28 2018 -0600
|
|
|
|
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) {
|