diff --git a/virt-manager.changes b/virt-manager.changes index aa4a7fae..b45dd08e 100644 --- a/virt-manager.changes +++ b/virt-manager.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Jul 8 15:15:31 MDT 2011 - carnold@novell.com + +- Upstream fixes + virtman-fix-storage_capable.diff + virtman-fix-ui-resize.diff + virtman-fix-type.diff + virtman-fix-addhw-nonhotplug.diff + virtman-fix-no-nic-present.diff + virtman-fix-ui-cleanup.diff + ------------------------------------------------------------------- Mon Apr 4 13:46:59 MDT 2011 - carnold@novell.com diff --git a/virt-manager.spec b/virt-manager.spec index 383fa132..3bafd36e 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -1,5 +1,5 @@ # -# spec file for package virt-manager +# spec file for package virt-manager (Version 0.8.7) # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -38,6 +38,12 @@ Source0: virt-manager-%{version}.tar.bz2 Source1: %{virtinst_name}.tar.bz2 # see https://bugzilla.redhat.com/show_bug.cgi?id=620216, # https://bugzilla.novell.com/show_bug.cgi?id=641981 +Patch0: virtman-fix-addhw-nonhotplug.diff +Patch1: virtman-fix-type.diff +Patch2: virtman-fix-no-nic-present.diff +Patch3: virtman-fix-storage_capable.diff +Patch4: virtman-fix-ui-resize.diff +Patch5: virtman-fix-ui-cleanup.diff Patch50: virtman-desktop.diff Patch51: virtman-vminstall.diff Patch52: virtman-cdrom.diff @@ -131,6 +137,12 @@ Authors: %prep %setup -q %setup -b 1 +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 %patch50 -p1 %patch51 -p1 %patch52 -p1 diff --git a/virtman-fix-addhw-nonhotplug.diff b/virtman-fix-addhw-nonhotplug.diff new file mode 100644 index 00000000..c2a723d7 --- /dev/null +++ b/virtman-fix-addhw-nonhotplug.diff @@ -0,0 +1,21 @@ + +Subject: addhw: Fix nonhotplug to running guest +From: Cole Robinson crobinso@redhat.com Tue Apr 5 16:15:05 2011 -0400 +Date: Tue Apr 5 16:15:05 2011 -0400: +Git: 4922222c2c7b13704b6f461aedbee9ec06c01b5b + + +Index: virt-manager-0.8.7/src/virtManager/addhardware.py +=================================================================== +--- virt-manager-0.8.7.orig/src/virtManager/addhardware.py ++++ virt-manager-0.8.7/src/virtManager/addhardware.py +@@ -922,7 +922,8 @@ class vmmAddHardware(vmmGObjectUI): + "Would you like to make the device available after the " + "next VM shutdown?")), + dialog_type=gtk.MESSAGE_WARNING, +- buttons=gtk.BUTTONS_YES_NO) ++ buttons=gtk.BUTTONS_YES_NO, ++ async=False) + + if not res: + return (False, None) diff --git a/virtman-fix-no-nic-present.diff b/virtman-fix-no-nic-present.diff new file mode 100644 index 00000000..4322f9a0 --- /dev/null +++ b/virtman-fix-no-nic-present.diff @@ -0,0 +1,23 @@ + +Subject: create: Fix building guest when no network options are present +From: Cole Robinson crobinso@redhat.com Thu Apr 7 17:11:10 2011 -0400 +Date: Thu Apr 7 17:11:10 2011 -0400: +Git: 6da0a95b5754b6415df15b08d6d9fbd3dc07eb7d + + +Index: virt-manager-0.8.7/src/virtManager/create.py +=================================================================== +--- virt-manager-0.8.7.orig/src/virtManager/create.py ++++ virt-manager-0.8.7/src/virtManager/create.py +@@ -1497,8 +1497,9 @@ class vmmCreate(vmmGObjectUI): + + if self.nic and self.nic in self.guest.get_devices("interface"): + self.guest.remove_device(self.nic) +- self.nic = nic +- self.guest.add_device(self.nic) ++ if nic: ++ self.nic = nic ++ self.guest.add_device(self.nic) + + return True + diff --git a/virtman-fix-storage_capable.diff b/virtman-fix-storage_capable.diff new file mode 100644 index 00000000..1a4a94f7 --- /dev/null +++ b/virtman-fix-storage_capable.diff @@ -0,0 +1,21 @@ + +Subject: host: Fix busted use of conn.storage_capable +From: Cole Robinson crobinso@redhat.com Sat Apr 9 21:27:41 2011 -0400 +Date: Sat Apr 9 21:55:41 2011 -0400: +Git: 239015d2486d6b41c49ff8fd8a84a0c454f386c9 + +Signed-off-by: Cole Robinson + +Index: virt-manager-0.8.7/src/virtManager/host.py +=================================================================== +--- virt-manager-0.8.7.orig/src/virtManager/host.py ++++ virt-manager-0.8.7/src/virtManager/host.py +@@ -365,7 +365,7 @@ class vmmHost(vmmGObjectUI): + _("Libvirt connection does not support virtual network " + "management.")) + +- if not self.conn.storage_capable: ++ if not self.conn.is_storage_capable(): + self.set_storage_error_page( + _("Libvirt connection does not support storage management.")) + diff --git a/virtman-fix-type.diff b/virtman-fix-type.diff new file mode 100644 index 00000000..d5db3a33 --- /dev/null +++ b/virtman-fix-type.diff @@ -0,0 +1,32 @@ + +Subject: schemas: Fix minor typo +From: Yuri Chornoivan yurchor@ukr.net Thu Apr 7 15:04:50 2011 -0400 +Date: Thu Apr 7 15:04:50 2011 -0400: +Git: f10063d6bd2d44e9cc1b2e980687d8c3d7a2efef + + +Index: virt-manager-0.8.7/AUTHORS +=================================================================== +--- virt-manager-0.8.7.orig/AUTHORS ++++ virt-manager-0.8.7/AUTHORS +@@ -69,6 +69,7 @@ Further patches have been submitted by: + Niels de Vos + Wen Congyang + Gerhard Stenzel ++ Yuri Chornoivan + + <...send a patch & get your name here...> + +Index: virt-manager-0.8.7/src/virt-manager.schemas.in +=================================================================== +--- virt-manager-0.8.7.orig/src/virt-manager.schemas.in ++++ virt-manager-0.8.7/src/virt-manager.schemas.in +@@ -256,7 +256,7 @@ + + + Default save domain path +- Default path for saving VM snaphots ++ Default path for saving VM snapshots + + + diff --git a/virtman-fix-ui-cleanup.diff b/virtman-fix-ui-cleanup.diff new file mode 100644 index 00000000..fbc5958e --- /dev/null +++ b/virtman-fix-ui-cleanup.diff @@ -0,0 +1,27 @@ + +Subject: clone: Fix cleanup when repopulating the UI +From: Cole Robinson crobinso@redhat.com Thu Apr 14 13:12:24 2011 -0400 +Date: Thu Apr 14 13:12:24 2011 -0400: +Git: 2c98bc67888e3e54d3dec93e3e55f9b4da1d56d5 + + +Index: virt-manager-0.8.7/src/virtManager/clone.py +=================================================================== +--- virt-manager-0.8.7.orig/src/virtManager/clone.py ++++ virt-manager-0.8.7/src/virtManager/clone.py +@@ -198,6 +198,7 @@ class vmmCloneVM(vmmGObjectUI): + net_box = self.window.get_widget("clone-network-box") + for c in net_box.get_children(): + net_box.remove(c) ++ c.destroy() + + self.net_list = {} + self.mac_list = [] +@@ -477,6 +478,7 @@ class vmmCloneVM(vmmGObjectUI): + storage_box = self.window.get_widget("clone-storage-box") + for c in storage_box.get_children(): + storage_box.remove(c) ++ c.destroy() + + for target in self.target_list: + disk = self.storage_list[target] diff --git a/virtman-fix-ui-resize.diff b/virtman-fix-ui-resize.diff new file mode 100644 index 00000000..76dcffbe --- /dev/null +++ b/virtman-fix-ui-resize.diff @@ -0,0 +1,31 @@ + +Subject: clone: Fix some UI resizing issues +From: Cole Robinson crobinso@redhat.com Thu Apr 14 13:07:52 2011 -0400 +Date: Thu Apr 14 13:07:52 2011 -0400: +Git: cc8e93061314714347f2b207ac4f9ecb6edeb4e6 + + +Index: virt-manager-0.8.7/src/virtManager/clone.py +=================================================================== +--- virt-manager-0.8.7.orig/src/virtManager/clone.py ++++ virt-manager-0.8.7/src/virtManager/clone.py +@@ -128,6 +128,7 @@ class vmmCloneVM(vmmGObjectUI): + + def show(self): + self.reset_state() ++ self.topwin.resize(1, 1) + self.topwin.present() + + def close(self, ignore1=None, ignore2=None): +Index: virt-manager-0.8.7/src/vmm-clone.glade +=================================================================== +--- virt-manager-0.8.7.orig/src/vmm-clone.glade ++++ virt-manager-0.8.7/src/vmm-clone.glade +@@ -882,6 +882,7 @@ uses the existing disk image for both th + + + ++ False + 1 + +