- Upstream bug fixes

848123e6-fix-memory-stats-for-shutoff-VM.patch
  ebcb7c06-fix-exception-when-the-address-is-not-an-IP.patch
  c4d26d16-fix-VM-polling-on-old-libvirt.patch
  ac2be796-do-not-throw-exception-if-volume-or-pool-dont-exist.patch
  88e18c86-fix-sending-net-removed-signal.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=231

848123e6-fix-memory-stats-for-shutoff-VM.patch

@@ -0,0 +1,26 @@
+Subject: domain: Fix memory stats for shutoff VM (bz 1215453)
+From: Cole Robinson crobinso@redhat.com Mon May 4 15:50:01 2015 -0400
+Date: Mon May 4 15:50:01 2015 -0400:
+Git: 848123e6c8850bafad28767a165bbbf8dc746a09
+
+memory doesn't have a separate input/output stats, so we shouldn't use
+the in_out_vector_helper. This resulted in shutoff VMs appearing to still
+use memory in the manager window.
+
+diff --git a/virtManager/domain.py b/virtManager/domain.py
+index cdb8cd5..e96b80f 100644
+--- a/virtManager/domain.py
++++ b/virtManager/domain.py
+@@ -1699,8 +1699,10 @@ class vmmDomain(vmmLibvirtObject):
+             cpudata = cpudata[0:limit]
+         return cpudata
+     def memory_usage_vector_limit(self, limit):
+-        return self.in_out_vector_limit(self.stats_memory_vector(),
+-                                        limit)
++        data = self.stats_memory_vector()
++        if len(data) > limit:
++            data = data[0:limit]
++        return data
+     def network_traffic_vector_limit(self, limit, ceil=None):
+         return self.in_out_vector_limit(self.network_traffic_vector(ceil),
+                                         limit)

88e18c86-fix-sending-net-removed-signal.patch

@@ -0,0 +1,30 @@
+Subject: connection: Fix sending net-removed signal
+From: Cole Robinson crobinso@redhat.com Thu May 7 12:30:28 2015 -0400
+Date: Thu May 7 12:30:28 2015 -0400:
+Git: 88e18c86d36406b3dab032b2bb21b46767871b4b
+
+
+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
+@@ -961,13 +961,17 @@ class vmmConnection(vmmGObject):
+ 
+         for obj in gone_objects:
+             class_name = obj.class_name()
++            try:
++                name = obj.get_name()
++            except:
++                name = str(obj)
+ 
+             if not self._objects.remove(obj):
+                 logging.debug("Requested removal of %s=%s, but it's "
+-                    "not in our object list.", class_name, obj.get_name())
++                    "not in our object list.", class_name, name)
+                 continue
+ 
+-            logging.debug("%s=%s removed", class_name, obj.get_name())
++            logging.debug("%s=%s removed", class_name, name)
+             if class_name == "domain":
+                 self.emit("vm-removed", obj.get_connkey())
+             elif class_name == "network":

ac2be796-do-not-throw-exception-if-volume-or-pool-dont-exist.patch

@@ -0,0 +1,51 @@
+Subject: storage: do not throw exception if the volume or the pool don't exist
+From: Giuseppe Scrivano gscrivan@redhat.com Thu May 7 13:42:00 2015 +0200
+Date: Thu May 7 17:42:58 2015 +0200:
+Git: ac2be79658ec5673d00ca9603db63b9b0de4fbd3
+
+commit 5357b91402fb7a8a73921216926908c08f6ad99d changed the semantic of
+conn.get_(vm|pool|interface|nodedev|net), to return None instead of
+raising KeyError. Leave the exception handling code in case the
+semantic is going to be reverted.
+
+Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1219427
+
+Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
+
+Index: virt-manager-1.2.0/virtManager/delete.py
+===================================================================
+--- virt-manager-1.2.0.orig/virtManager/delete.py
++++ virt-manager-1.2.0/virtManager/delete.py
+@@ -236,7 +236,11 @@ def populate_storage_list(storage_list,
+         if disk.source_pool:
+             try:
+                 pool = conn.get_pool(disk.source_pool)
++                if pool is None:
++                    return disk.path
+                 vol = pool.get_volume(disk.path)
++                if vol is None:
++                    return disk.path
+                 return vol.get_target_path()
+             except KeyError:
+                 return disk.path
+Index: virt-manager-1.2.0/virtManager/details.py
+===================================================================
+--- virt-manager-1.2.0.orig/virtManager/details.py
++++ virt-manager-1.2.0/virtManager/details.py
+@@ -2698,12 +2698,14 @@ class vmmDetails(vmmGObjectUI):
+         if not path:
+             size = "-"
+         else:
++            vol = None
+             if source_pool:
+                 try:
+                     pool = self.conn.get_pool(source_pool)
+-                    vol = pool.get_volume(path)
++                    if pool is not None:
++                        vol = pool.get_volume(path)
+                 except KeyError:
+-                    vol = None
++                    pass
+             else:
+                 vol = self.conn.get_vol_by_path(path)
+ 

c4d26d16-fix-VM-polling-on-old-libvirt.patch

@@ -0,0 +1,20 @@
+Subject: pollhelpers: Fix VM polling on old libvirt
+From: Michał Kępień michal.kepien@nask.pl Thu May 7 11:10:20 2015 -0400
+Date: Thu May 7 11:10:20 2015 -0400:
+Git: c4d26d16a65e0ce6b88323e13669c7c388397d7f
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1219443
+
+diff --git a/virtinst/pollhelpers.py b/virtinst/pollhelpers.py
+index 3eeada4..dafd079 100644
+--- a/virtinst/pollhelpers.py
++++ b/virtinst/pollhelpers.py
+@@ -268,7 +268,7 @@ def _old_fetch_vms(backend, origmap, build_func):
+             except:
+                 logging.exception("Couldn't fetch domain '%s'", name)
+ 
+-    return (origmap, new, current)
++    return (origmap.values(), new.values(), current.values())
+ 
+ 
+ def fetch_vms(backend, origmap, build_func):

ebcb7c06-fix-exception-when-the-address-is-not-an-IP.patch

@@ -0,0 +1,34 @@
+Subject: sshtunnels: fix exception when the address is not an IP
+From: Giuseppe Scrivano gscrivan@redhat.com Wed May 6 12:52:40 2015 +0200
+Date: Wed May 6 21:27:50 2015 +0200:
+Git: ebcb7c064ca5a3afd2ec3a0c8f59328a7f71b009
+
+bug introduced with commit a2d453f3e20d103a4767394300c5183fde9a6bb4
+
+Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1218958
+
+Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
+
+diff --git a/virtManager/sshtunnels.py b/virtManager/sshtunnels.py
+index 53f43be..03e1738 100644
+--- a/virtManager/sshtunnels.py
++++ b/virtManager/sshtunnels.py
+@@ -48,10 +48,16 @@ class ConnectionInfo(object):
+             self._connhost = "127.0.0.1"
+ 
+     def _is_listen_localhost(self, host=None):
+-        return ipaddr.IPNetwork(host or self.gaddr).is_loopback
++        try:
++            return ipaddr.IPNetwork(host or self.gaddr).is_loopback
++        except:
++            return False
+ 
+     def _is_listen_any(self):
+-        return ipaddr.IPNetwork(self.gaddr).is_unspecified
++        try:
++            return ipaddr.IPNetwork(self.gaddr).is_unspecified
++        except:
++            return False
+ 
+     def need_tunnel(self):
+         if not self._is_listen_localhost():

virt-manager.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri May  8 11:08:49 MDT 2015 - carnold@suse.com
+
+- Upstream bug fixes
+  848123e6-fix-memory-stats-for-shutoff-VM.patch
+  ebcb7c06-fix-exception-when-the-address-is-not-an-IP.patch
+  c4d26d16-fix-VM-polling-on-old-libvirt.patch
+  ac2be796-do-not-throw-exception-if-volume-or-pool-dont-exist.patch
+  88e18c86-fix-sending-net-removed-signal.patch
+
 -------------------------------------------------------------------
 Mon May  4 13:38:06 MDT 2015 - carnold@suse.com
 

virt-manager.spec

@@ -37,6 +37,11 @@ Source0:        %{name}-%{version}.tar.bz2
 Source1:        virt-install.rb
 Source2:        virt-install.desktop
 # Upstream Patches
+Patch1:         848123e6-fix-memory-stats-for-shutoff-VM.patch
+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
 # SUSE Only
 Patch70:        virtman-desktop.patch
 Patch71:        virtman-kvm.patch
@@ -155,6 +160,11 @@ machine).
 %prep
 %setup -q
 # Upstream Patches
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 # SUSE Only
 %patch70 -p1
 %patch71 -p1

virtman-dont-allow-grub.xen-to-be-deleted.patch

@@ -1,11 +1,11 @@
 Reference: bnc#885094
 grub.xen is required to boot Xen PV VMs using BTRFS. It belongs to
 the grub2-x86_64-xen RPM and should never be deleted.
-Index: virt-manager-1.1.0/virtManager/delete.py
+Index: virt-manager-1.2.0/virtManager/delete.py
 ===================================================================
---- virt-manager-1.1.0.orig/virtManager/delete.py
+--- virt-manager-1.2.0.orig/virtManager/delete.py
-+++ virt-manager-1.1.0/virtManager/delete.py
++++ virt-manager-1.2.0/virtManager/delete.py
-@@ -250,7 +250,7 @@ def populate_storage_list(storage_list,
+@@ -254,7 +254,7 @@ def populate_storage_list(storage_list,
      diskdata.append(("dtb", vm.get_xmlobj().os.dtb, True, False))
  
      for target, path, ro, shared in diskdata: