From 552053bd414d3561c88b4deaf28986f0b636b01e Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Mon, 11 May 2015 20:58:38 +0000 Subject: [PATCH] - Upstream bug fixes fbdf574c-fix-shortcut-key-for-USB-redir-dev-type.patch 2c1e482b-fix--show-host-summary-error-windows-flooding.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=232 --- ...-host-summary-error-windows-flooding.patch | 26 +++++++++++++++++++ ...-shortcut-key-for-USB-redir-dev-type.patch | 25 ++++++++++++++++++ virt-manager.changes | 7 +++++ virt-manager.spec | 4 +++ 4 files changed, 62 insertions(+) create mode 100644 2c1e482b-fix--show-host-summary-error-windows-flooding.patch create mode 100644 fbdf574c-fix-shortcut-key-for-USB-redir-dev-type.patch diff --git a/2c1e482b-fix--show-host-summary-error-windows-flooding.patch b/2c1e482b-fix--show-host-summary-error-windows-flooding.patch new file mode 100644 index 00000000..ed13082a --- /dev/null +++ b/2c1e482b-fix--show-host-summary-error-windows-flooding.patch @@ -0,0 +1,26 @@ +Subject: virt-manager: fix --show-host-summary error windows flooding +From: Giuseppe Scrivano gscrivan@redhat.com Mon May 11 15:05:57 2015 +0200 +Date: Mon May 11 20:20:10 2015 +0200: +Git: 2c1e482b2df58e76624cb30625ce4bed0c663275 + +Break an endless loop vmmHost.overview_name_changed -> +vmmHost.conn_state_changed -> vmmHost._overview_name_changed. + +Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1220322 + +Signed-off-by: Giuseppe Scrivano + +Index: virt-manager-1.2.0/virtManager/connection.py +=================================================================== +--- virt-manager-1.2.0.orig/virtManager/connection.py ++++ virt-manager-1.2.0/virtManager/connection.py +@@ -1346,7 +1346,8 @@ class vmmConnection(vmmGObject): + self.config.set_conn_autoconnect(self.get_uri(), val) + + def set_config_pretty_name(self, value): +- self.config.set_perconn(self.get_uri(), "/pretty-name", value) ++ if value != self._get_config_pretty_name(): ++ self.config.set_perconn(self.get_uri(), "/pretty-name", value) + def _get_config_pretty_name(self): + return self.config.get_perconn(self.get_uri(), "/pretty-name") + def _on_config_pretty_name_changed(self, *args, **kwargs): diff --git a/fbdf574c-fix-shortcut-key-for-USB-redir-dev-type.patch b/fbdf574c-fix-shortcut-key-for-USB-redir-dev-type.patch new file mode 100644 index 00000000..15f74695 --- /dev/null +++ b/fbdf574c-fix-shortcut-key-for-USB-redir-dev-type.patch @@ -0,0 +1,25 @@ +Subject: add-hardware: fix shortcut key for USB redir dev type +From: Giuseppe Scrivano gscrivan@redhat.com Mon May 11 10:02:54 2015 +0200 +Date: Mon May 11 10:17:11 2015 +0200: +Git: fbdf574c53fc0138d4f346b0dbfebff28117605a + +Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1172108 + +Signed-off-by: Giuseppe Scrivano + +diff --git a/ui/addhardware.ui b/ui/addhardware.ui +index 54dc695..32beb4f 100644 +--- a/ui/addhardware.ui ++++ b/ui/addhardware.ui +@@ -1373,9 +1373,10 @@ + + True + False ++ 1 + _Type: + True +- 1 ++ usbredir-list + + + 0 diff --git a/virt-manager.changes b/virt-manager.changes index 3e2ef520..7578059f 100644 --- a/virt-manager.changes +++ b/virt-manager.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon May 11 14:37:27 MDT 2015 - carnold@suse.com + +- Upstream bug fixes + fbdf574c-fix-shortcut-key-for-USB-redir-dev-type.patch + 2c1e482b-fix--show-host-summary-error-windows-flooding.patch + ------------------------------------------------------------------- Fri May 8 11:08:49 MDT 2015 - carnold@suse.com diff --git a/virt-manager.spec b/virt-manager.spec index a5919a8e..81cbca78 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -42,6 +42,8 @@ Patch2: ebcb7c06-fix-exception-when-the-address-is-not-an-IP.patch Patch3: c4d26d16-fix-VM-polling-on-old-libvirt.patch Patch4: ac2be796-do-not-throw-exception-if-volume-or-pool-dont-exist.patch Patch5: 88e18c86-fix-sending-net-removed-signal.patch +Patch6: fbdf574c-fix-shortcut-key-for-USB-redir-dev-type.patch +Patch7: 2c1e482b-fix--show-host-summary-error-windows-flooding.patch # SUSE Only Patch70: virtman-desktop.patch Patch71: virtman-kvm.patch @@ -165,6 +167,8 @@ machine). %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 +%patch7 -p1 # SUSE Only %patch70 -p1 %patch71 -p1