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

- Upstream bug fixes

Browse Source 
530f80f5-handle-missing-storage-volumes.patch
  5310bd89-console-fix-unsetting-resize-guest.patch
  5310e3ac-set-show_arrow-to-true.patch
  5310e3ac-vmmConsolePages-toggle-visibilities-on-page-change.patch
  5310e3ac-vmmDetails-toggle-visibilities-on-page-change.patch
  5310e52d-fix-setting-default-window-size.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=147
This commit is contained in:
Charles Arnold 2014-03-03 21:54:35 +00:00 committed by Git OBS Bridge
parent 674941bbf7
commit 9dab6bfcb9
10 changed files with 173 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
530f80f5-handle-missing-storage-volumes.patch Normal file
View File

@ -0,0 +1,34 @@
Subject: vmm connection: Handle missing storage volumes (bz 1070883)
From: Cole Robinson crobinso@redhat.com Thu Feb 27 13:16:21 2014 -0500
Date: Thu Feb 27 13:16:21 2014 -0500:
Git: f67df117017e6de855a8c0e900e47fe920dfaa48
Similar to what was done in a808bd669293ac66047a716b2e84a5a64c99667b
for the virtinst connection wrapper.
diff --git a/virtManager/connection.py b/virtManager/connection.py
index 6f6c838..96dfa1c 100644
--- a/virtManager/connection.py
+++ b/virtManager/connection.py
@@ -172,10 +172,17 @@ class vmmConnection(vmmGObject):
self._backend.cb_fetch_all_pools = (
lambda: [obj.get_xmlobj(refresh_if_nec=False)
for obj in self.pools.values()])
- self._backend.cb_fetch_all_vols = (
- lambda: [obj.get_xmlobj(refresh_if_nec=False)
- for pool in self.pools.values()
- for obj in pool.get_volumes(refresh=False).values()])
+
+ def fetch_all_vols():
+ ret = []
+ for pool in self.pools.values():
+ for vol in pool.get_volumes(refresh=False).values():
+ try:
+ ret.append(vol.get_xmlobj(refresh_if_nec=False))
+ except libvirt.libvirtError, e:
+ logging.debug("Fetching volume XML failed: %s", e)
+ return ret
+ self._backend.cb_fetch_all_vols = fetch_all_vols
def clear_cache(pools=False):
if not pools:

20
5310bd89-console-fix-unsetting-resize-guest.patch Normal file
View File

@ -0,0 +1,20 @@
Subject: console: Fix unsetting 'resize-guest' property from UI
From: Cole Robinson crobinso@redhat.com Fri Feb 28 11:46:05 2014 -0500
Date: Fri Feb 28 11:47:05 2014 -0500:
Git: 4a2493f1e4bede671eac713081f61965f036d6ed
Reported in the followup of bz 754559
diff --git a/virtManager/console.py b/virtManager/console.py
index ccbd6bf..122bf27 100644
--- a/virtManager/console.py
+++ b/virtManager/console.py
@@ -1092,7 +1092,7 @@ class vmmConsolePages(vmmGObjectUI):
def resizeguest_ui_changed_cb(self, src):
# Called from details.py
- if not src.get_active():
+ if not src.get_sensitive():
return
val = int(self.widget("details-menu-view-resizeguest").get_active())

18
5310e3ac-set-show_arrow-to-true.patch Normal file
View File

@ -0,0 +1,18 @@
Subject: details-toolbar: set show_arrow to true
From: Maros Zatko mzatko@redhat.com Fri Feb 28 19:35:50 2014 +0100
Date: Fri Feb 28 14:29:48 2014 -0500:
Git: 44d4c1d3293348d93bebc8c376691add15a4fcea
Index: virt-manager-1.0.0/ui/details.ui
===================================================================
--- virt-manager-1.0.0.orig/ui/details.ui
+++ virt-manager-1.0.0/ui/details.ui
@@ -371,7 +371,6 @@
<object class="GtkToolbar" id="details-toolbar">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="show_arrow">False</property>
<child>
<object class="GtkRadioToolButton" id="control-vm-console">
<property name="visible">True</property>

25
5310e3ac-vmmConsolePages-toggle-visibilities-on-page-change.patch Normal file
View File

@ -0,0 +1,25 @@
Subject: vmmConsolePages: toggle visibilities on page change
From: Maros Zatko mzatko@redhat.com Fri Feb 28 19:35:48 2014 +0100
Date: Fri Feb 28 14:29:48 2014 -0500:
Git: dfa23765b569721effba959f35e5217aff908fea
diff --git a/virtManager/console.py b/virtManager/console.py
index 122bf27..dec2657 100644
--- a/virtManager/console.py
+++ b/virtManager/console.py
@@ -1319,8 +1319,13 @@ class vmmConsolePages(vmmGObjectUI):
self.widget("details-menu-usb-redirection").set_sensitive(True)
return
- def page_changed(self, ignore1=None, ignore2=None, ignore3=None):
+ def page_changed(self, ignore1=None, ignore2=None, newpage=None):
pagenum = self.widget("console-pages").get_current_page()
+
+ for i in range(self.widget("console-pages").get_n_pages()):
+ w = self.widget("console-pages").get_nth_page(i)
+ w.set_visible(i == newpage)
+
if pagenum < CONSOLE_PAGE_OFFSET:
self.last_gfx_page = pagenum
self.set_allow_fullscreen()

23
5310e3ac-vmmDetails-toggle-visibilities-on-page-change.patch Normal file
View File

@ -0,0 +1,23 @@
Subject: vmmDetails: toggle visibilities on page change
From: Maros Zatko mzatko@redhat.com Fri Feb 28 19:35:49 2014 +0100
Date: Fri Feb 28 14:29:48 2014 -0500:
Git: 74e6d439035a7826f9ed0a70b1c4f0b1141997cc
Index: virt-manager-1.0.0/virtManager/details.py
===================================================================
--- virt-manager-1.0.0.orig/virtManager/details.py
+++ virt-manager-1.0.0/virtManager/details.py
@@ -1269,7 +1269,11 @@ class vmmDetails(vmmGObjectUI):
finally:
self.ignoreDetails = False
- def switch_page(self, ignore1=None, ignore2=None, newpage=None):
+ def switch_page(self, notebook=None, ignore2=None, newpage=None):
+ for i in range(notebook.get_n_pages()):
+ w = notebook.get_nth_page(i)
+ w.set_visible(i == newpage)
+
self.page_refresh(newpage)
self.sync_details_console_view(newpage)

23
5310e52d-fix-setting-default-window-size.patch Normal file
View File

@ -0,0 +1,23 @@
Subject: details: Fix setting default window size
From: Cole Robinson crobinso@redhat.com Fri Feb 28 14:36:13 2014 -0500
Date: Fri Feb 28 14:36:13 2014 -0500:
Git: 3fcc2c2fed3f9ec0eb8a379080a6b616e18287f7
Index: virt-manager-1.0.0/virtManager/details.py
===================================================================
--- virt-manager-1.0.0.orig/virtManager/details.py
+++ virt-manager-1.0.0/virtManager/details.py
@@ -521,7 +521,11 @@ class vmmDetails(vmmGObjectUI):
# Set default window size
w, h = self.vm.get_details_window_size()
- self.topwin.set_default_size(w or 800, h or 600)
+ if w <= 0:
+ w = 800
+ if h <= 0:
+ h = 600
+ self.topwin.set_default_size(w, h)
self.oldhwkey = None
self.addhwmenu = None

11
virt-manager.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Mon Mar 3 09:26:39 MST 2014 - carnold@suse.com
- Upstream bug fixes
530f80f5-handle-missing-storage-volumes.patch
5310bd89-console-fix-unsetting-resize-guest.patch
5310e3ac-set-show_arrow-to-true.patch
5310e3ac-vmmConsolePages-toggle-visibilities-on-page-change.patch
5310e3ac-vmmDetails-toggle-visibilities-on-page-change.patch
5310e52d-fix-setting-default-window-size.patch
-------------------------------------------------------------------
Wed Feb 27 08:00:39 MST 2014 - carnold@suse.com

12
virt-manager.spec
View File

@ -47,6 +47,12 @@ Patch9: 530c021c-attempt-empty-path-on-virDomainBlockStats.patch
Patch10: 530cd6ab-log-broken-xml.patch
Patch11: 530cf4de-allow-numbered-object-names.patch
Patch12: 530cfa5e-close-connection-on-tick-failure-fix.patch
Patch13: 530f80f5-handle-missing-storage-volumes.patch
Patch14: 5310bd89-console-fix-unsetting-resize-guest.patch
Patch15: 5310e3ac-set-show_arrow-to-true.patch
Patch16: 5310e3ac-vmmConsolePages-toggle-visibilities-on-page-change.patch
Patch17: 5310e3ac-vmmDetails-toggle-visibilities-on-page-change.patch
Patch18: 5310e52d-fix-setting-default-window-size.patch
Patch50: virtman-desktop.patch
Patch51: virtman-cdrom.patch
Patch52: virtman-kvm.patch
@ -169,6 +175,12 @@ machine).
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
%patch15 -p1
%patch16 -p1
%patch17 -p1
%patch18 -p1
%patch50 -p1
%patch51 -p1
%patch52 -p1

12
virtman-autorestart.patch
View File

@ -1,8 +1,8 @@
Index: virt-manager-0.10.1/virtManager/details.py
Index: virt-manager-1.0.0/virtManager/details.py
===================================================================
--- virt-manager-0.10.1.orig/virtManager/details.py
+++ virt-manager-0.10.1/virtManager/details.py
@@ -2009,12 +2009,10 @@ class vmmDetails(vmmGObjectUI):
--- virt-manager-1.0.0.orig/virtManager/details.py
+++ virt-manager-1.0.0/virtManager/details.py
@@ -2017,12 +2017,10 @@ class vmmDetails(vmmGObjectUI):
return self._change_config_helper(df, da, hf, ha)
@ -19,7 +19,7 @@ Index: virt-manager-0.10.1/virtManager/details.py
auto = self.widget("config-autostart")
try:
self.vm.set_autostart(auto.get_active())
@@ -2023,6 +2021,11 @@ class vmmDetails(vmmGObjectUI):
@@ -2031,6 +2029,11 @@ class vmmDetails(vmmGObjectUI):
(_("Error changing autostart value: %s") % str(e)))
return False
@ -31,7 +31,7 @@ Index: virt-manager-0.10.1/virtManager/details.py
if self.edited(EDIT_BOOTORDER):
bootdevs = self.get_config_boot_order()
add_define(self.vm.set_boot_order, bootdevs)
@@ -2377,6 +2380,8 @@ class vmmDetails(vmmGObjectUI):
@@ -2385,6 +2388,8 @@ class vmmDetails(vmmGObjectUI):
buttons=Gtk.ButtonsType.OK,
dialog_type=dtype)

2
virtman-device-flags.patch
View File

@ -25,7 +25,7 @@ Index: virt-manager-1.0.0/virtManager/details.py
===================================================================
--- virt-manager-1.0.0.orig/virtManager/details.py
+++ virt-manager-1.0.0/virtManager/details.py
@@ -2270,6 +2270,17 @@ class vmmDetails(vmmGObjectUI):
@@ -2278,6 +2278,17 @@ class vmmDetails(vmmGObjectUI):
text1=(_("Are you sure you want to remove this device?"))):
return