- 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

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=53
This commit is contained in:
Charles Arnold 2011-07-08 22:29:58 +00:00 committed by Git OBS Bridge
parent b728e748a1
commit 8e527d3db7
8 changed files with 179 additions and 1 deletions

View File

@ -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

View File

@ -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

View File

@ -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)

View File

@ -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

View File

@ -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 <crobinso@redhat.com>
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."))

32
virtman-fix-type.diff Normal file
View File

@ -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 <ndevos-at-redhat-dot-com>
Wen Congyang <wency-at-cn-dot-fujitsu-dot-com>
Gerhard Stenzel <gerhard-dot-stenzel-at-de-dot-ibm-dot-com>
+ Yuri Chornoivan <yurchor-at-ukr-dot-net>
<...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 @@
<locale name="C">
<short>Default save domain path</short>
- <long>Default path for saving VM snaphots</long>
+ <long>Default path for saving VM snapshots</long>
</locale>
</schema>

View File

@ -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]

View File

@ -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
</child>
</widget>
<packing>
+ <property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>