diff --git a/virt-manager-console-cleanup-crash.patch b/virt-manager-console-cleanup-crash.patch new file mode 100644 index 0000000..6bcaf40 --- /dev/null +++ b/virt-manager-console-cleanup-crash.patch @@ -0,0 +1,26 @@ +commit 930a321f8e411cd02f4f43c193f967763e8b6e5c +Author: Cole Robinson +Date: Fri Oct 28 12:20:11 2011 -0400 + + console: Fix crashes when deleting vm on F16 + + The toolbar cleanup order was causing crashed on f16 at app shutdown or + VM delete (when a console window is fully uninstantiated) + +diff --git a/src/virtManager/console.py b/src/virtManager/console.py +index d6d95cd..559bb31 100644 +--- a/src/virtManager/console.py ++++ b/src/virtManager/console.py +@@ -603,10 +603,10 @@ class vmmConsolePages(vmmGObjectUI): + + self.keycombo_menu.destroy() + self.keycombo_menu = None +- self.fs_toolbar.destroy() +- self.fs_toolbar = None + self.fs_drawer.destroy() + self.fs_drawer = None ++ self.fs_toolbar.destroy() ++ self.fs_toolbar = None + + ########################## + # Initialization helpers # diff --git a/virt-manager.spec b/virt-manager.spec index 613c5eb..06bee2d 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -2,7 +2,7 @@ %define _package virt-manager %define _version 0.9.0 -%define _release 7 +%define _release 8 %define virtinst_version 0.600.0 %define qemu_user "qemu" @@ -46,6 +46,8 @@ Patch4: %{name}-default-storage-error.patch Patch5: %{name}-cache-xml-fix.patch # Use labels for non-editable network info fields (bz 738751) Patch6: %{name}-host-net-labels.patch +# Fix crashes when deleting a VM (bz 749263) +Patch7: %{name}-console-cleanup-crash.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -160,6 +162,7 @@ Common files used by the different Virtual Machine Manager interfaces. %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build %if %{qemu_user} @@ -277,6 +280,9 @@ update-desktop-database -q %{_datadir}/applications %endif %changelog +* Fri Oct 28 2011 Cole Robinson - 0.9.0-8 +- Fix crashes when deleting a VM (bz 749263) + * Tue Sep 27 2011 Cole Robinson - 0.9.0-7 - Fix 'Resize to VM' graphical option (bz 738806) - Fix deleting guest with managed save data