pool/virt-manager
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- Dropped patch as libvirt has fix for issue

Browse Source 
virtman-shutdown-with-acpi-button.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=171
This commit is contained in:
Charles Arnold 2014-05-02 00:16:14 +00:00 committed by Git OBS Bridge
parent d000eb9d85
commit e46dd08c33
3 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
virt-manager.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu May 1 16:24:54 MDT 2014 - carnold@suse.com
- Dropped patch as libvirt has fix for issue
virtman-shutdown-with-acpi-button.patch
-------------------------------------------------------------------
Wed Apr 30 07:24:54 MDT 2014 - carnold@suse.com

3
virt-manager.spec
View File

@ -15,7 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define with_guestfs 0
%define askpass_package "openssh-askpass"
%define qemu_user "qemu"
@ -79,7 +78,6 @@ Patch66: virtman-load-stored-uris.patch
Patch67: virtman-libvirtd-not-running.patch
Patch68: virtman-stable-os-support.patch
Patch69: virtman-add-s390x-arch-support.patch
Patch70: virtman-shutdown-with-acpi-button.patch
Patch151: virtinst-storage-ocfs2.patch
Patch152: virtinst-qed.patch
Patch153: virtinst-support-suse-distros.patch
@ -222,7 +220,6 @@ machine).
%patch67 -p1
%patch68 -p1
%patch69 -p1
%patch70 -p1
%patch151 -p1
%patch152 -p1
%patch153 -p1

19
virtman-shutdown-with-acpi-button.patch
View File

@ -1,19 +0,0 @@
bnc#872777
Index: virt-manager-1.0.1/virtManager/domain.py
===================================================================
--- virt-manager-1.0.1.orig/virtManager/domain.py
+++ virt-manager-1.0.1/virtManager/domain.py
@@ -1330,7 +1330,11 @@ class vmmDomain(vmmLibvirtObject):
def shutdown(self):
self._install_abort = True
self._unregister_reboot_listener()
- self._backend.shutdown()
+ try:
+ self._backend.shutdown()
+ except libvirt.libvirtError:
+ logging.debug("Initial shutdown failed. Attempting shutdown with acpi power button")
+ self._backend.shutdownFlags(libvirt.VIR_DOMAIN_SHUTDOWN_ACPI_POWER_BTN)
self.idle_add(self.force_update_status)
def reboot(self):