diff --git a/virt-manager.changes b/virt-manager.changes index 5a6bd39f..010308f4 100644 --- a/virt-manager.changes +++ b/virt-manager.changes @@ -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 diff --git a/virt-manager.spec b/virt-manager.spec index 0b0b2376..da8d6345 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -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 diff --git a/virtman-shutdown-with-acpi-button.patch b/virtman-shutdown-with-acpi-button.patch deleted file mode 100644 index 88850b00..00000000 --- a/virtman-shutdown-with-acpi-button.patch +++ /dev/null @@ -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):