Merge ~paelzer/ubuntu/+source/virt-manager:bionic-lp-1763609 into ubuntu/+source/virt-manager:ubuntu/devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

Test builds in https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3238

41f2b97... by Christian Ehrhardt  on 2018-04-13

stable release 1.5.1 changes (LP: #1763618)

Signed-off-by: Christian Ehrhardt <email address hidden>

38418ab... by Christian Ehrhardt  on 2018-04-13

changelog: stable release 1.5.1 changes (LP: #1763618)

Signed-off-by: Christian Ehrhardt <email address hidden>

[Christian Ehrhardt  (paelzer)]

Extended by upstream stable fixes to avoid crashes in what we release in Bionic.

[Robie Basak (racb)]

Why doesn't this pull in a new upstream tarball instead of patching up to the equivalent against 1.5.0? Or have I misunderstood?

review: Needs Information

[Christian Ehrhardt  (paelzer)]

Minor updates on the virt stack where in the past taken as patches OR tarballs by Debian.
Due to that we evaluate on a given change if we want to do it as a patch (when ahead) to avoid getting in conflict with orig tarballs down the road.

Given how small the changes to 1.5.1 were I decided this is the least-pain approach for this case.

[Robie Basak (racb)]

OK, thanks.

I'm not sure about this pattern. I've not seen it before. I'm on the fence. I appreciate it might save future pain, but it also feels a little misleading to users, who might only glance at the version string and not the changelog.

I'm interested to know what other core devs think.

1e89f2d... by Christian Ehrhardt  on 2018-04-16

remove 1.5.1 as patch

Signed-off-by: Christian Ehrhardt <email address hidden>

48cae61... by Christian Ehrhardt  on 2018-04-16

changelog: use upstream tarball for 1.5.1 stable update

Signed-off-by: Christian Ehrhardt <email address hidden>

a48abc8... by Christian Ehrhardt  on 2018-04-16

New upstream release 1.5.1

Signed-off-by: Christian Ehrhardt <email address hidden>

[Christian Ehrhardt  (paelzer)]

As discussed on IRC, lets decouple the "lets gather opinions" from this case.
Here is had no strong reason so we can go either way.
I repackaged it the classic way with the new orig tarball.

Tarball is from: https://virt-manager.org/download/sources/virt-manager/virt-manager-1.5.1.tar.gz
MP is updated to match all that (removing the patch based approach and adapting changelog).

An new test build is uploaded to https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3238

[Robie Basak (racb)]

review: Approve

[Christian Ehrhardt  (paelzer)]

Thanks for the review - Tag pushed and source uploaded.

diff --git a/NEWS.md b/NEWS.md
index 46bf056..1eef998 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,10 @@
 # Virtual Machine Manager News
 
+## Release 1.5.1 (February 28, 2018)
+- Bug fix release
+- Fix potential crash with libxml2 error callbacks
+- Fix disk/net/mem VM graphs
+
 ## Release 1.5.0 (February 06, 2018)
 - python3 prep work (Radostin Stoyanov, Cole Robinson, Cédric Bosdonnat)
 - Switch --location ISO to use isoinfo (Andrew Wong)
diff --git a/PKG-INFO b/PKG-INFO
index c3ecce2..8741bde 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: virt-manager
-Version: 1.5.0
+Version: 1.5.1
 Summary: UNKNOWN
 Home-page: http://virt-manager.org
 Author: Cole Robinson
diff --git a/debian/changelog b/debian/changelog
index 4b4928e..313de10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+virt-manager (1:1.5.1-0ubuntu1) bionic; urgency=medium
+
+  * d/control: virtinst needs isoinfo to introspect images. To fix that
+    add a dependency to genisoimage to virtinst (LP: #1763609)
+  * Merge with latest upstream stable release (LP: #1763618):
+    - Fixes potential crash with libxml2 error callbacks
+    - Fixes disk/net/mem VM graphs
+
+ -- Christian Ehrhardt <[e-mail]>  Fri, 13 Apr 2018 09:36:46 +0200
+
 virt-manager (1:1.5.0-0ubuntu1) bionic; urgency=medium
 
   * Merge with Debian unstable 1:1.4.3-1 (LP: #1747907 LP: #1741861)
diff --git a/debian/control b/debian/control
index 28fe1f0..6297811 100644
--- a/debian/control
+++ b/debian/control
@@ -66,6 +66,7 @@ Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-libvirt (
  python-ipaddr,
  python-libxml2, python-requests,
  gir1.2-libosinfo-1.0,
+ genisoimage,
 Recommends: virt-viewer, qemu-utils
 Description: Programs to create and clone virtual machines
  Virtinst is a set of commandline tools to create virtual machines using
diff --git a/virt-manager.spec b/virt-manager.spec
index 60f6d5d..aa1a8f3 100644
--- a/virt-manager.spec
+++ b/virt-manager.spec
@@ -19,7 +19,7 @@
 # End local config
 
 Name: virt-manager
-Version: 1.5.0
+Version: 1.5.1
 Release: 1%{?dist}
 %global verrel %{version}-%{release}
 
diff --git a/virtManager/domain.py b/virtManager/domain.py
index ed94cf1..6d3dac2 100644
--- a/virtManager/domain.py
+++ b/virtManager/domain.py
@@ -1984,7 +1984,7 @@ class vmmDomain(vmmLibvirtObject):
         except libvirt.libvirtError as err:
             logging.error("Error reading mem stats: %s", err)
 
-        pcentCurrMem = (curmem // float(totalmem)) * 100
+        pcentCurrMem = (curmem / float(totalmem)) * 100
         pcentCurrMem = max(0.0, min(pcentCurrMem, 100.0))
 
         return pcentCurrMem, curmem
diff --git a/virtManager/manager.py b/virtManager/manager.py
index d6640fb..d38fc4e 100644
--- a/virtManager/manager.py
+++ b/virtManager/manager.py
@@ -1068,7 +1068,7 @@ class vmmManager(vmmGObjectUI):
             return
 
         d1, d2 = obj.disk_io_vectors(GRAPH_LEN, self.max_disk_rate)
-        data = [(x + y) // 2 for x, y in zip(d1, d2)]
+        data = [(x + y) / 2 for x, y in zip(d1, d2)]
         cell.set_property('data_array', data)
 
     def network_traffic_img(self, column_ignore, cell, model, _iter, data):
@@ -1077,5 +1077,5 @@ class vmmManager(vmmGObjectUI):
             return
 
         d1, d2 = obj.network_traffic_vectors(GRAPH_LEN, self.max_net_rate)
-        data = [(x + y) // 2 for x, y in zip(d1, d2)]
+        data = [(x + y) / 2 for x, y in zip(d1, d2)]
         cell.set_property('data_array', data)
diff --git a/virtcli/cliconfig.py b/virtcli/cliconfig.py
index b2446b2..b58b116 100644
--- a/virtcli/cliconfig.py
+++ b/virtcli/cliconfig.py
@@ -68,7 +68,7 @@ def _setup_gsettings_path(schemadir):
         raise RuntimeError("Failed to compile local gsettings schemas")
 
 
-__version__ = "1.5.0"
+__version__ = "1.5.1"
 
 
 class _CLIConfig(object):
diff --git a/virtinst/util.py b/virtinst/util.py
index 2a7bc4d..73c7f78 100644
--- a/virtinst/util.py
+++ b/virtinst/util.py
@@ -298,12 +298,7 @@ def register_libvirt_error_handler():
     def libvirt_callback(userdata, err):
         ignore = userdata
         ignore = err
-    def libxml2_callback(userdata, err):
-        ignore = userdata
-        logging.debug("libxml2 callback error: %s", err)
     libvirt.registerErrorHandler(f=libvirt_callback, ctx=None)
-    import libxml2
-    libxml2.registerErrorHandler(f=libxml2_callback, ctx=None)
 
 
 def ensure_meter(meter):
diff --git a/virtinst/xmlbuilder.py b/virtinst/xmlbuilder.py
index 550fea8..521a14f 100644
--- a/virtinst/xmlbuilder.py
+++ b/virtinst/xmlbuilder.py
@@ -688,6 +688,10 @@ class _XMLState(object):
                  relative_object_xpath):
         self._root_name = root_name
         self._stub_path = "/%s" % self._root_name
+        self._namespace = ""
+        if ":" in self._root_name:
+            ns = self._root_name.split(":")[0]
+            self._namespace = " xmlns:%s='%s'" % (ns, _namespaces[ns])
 
         # xpath of this object relative to its parent. So for a standalone
         # <disk> this is empty, but if the disk is the forth one in a <domain>
@@ -718,6 +722,10 @@ class _XMLState(object):
 
         if not parsexml:
             parsexml = self.make_xml_stub()
+        elif self._namespace and "xmlns" not in parsexml:
+            # Make sure passed in XML has required xmlns inserted
+            parsexml = parsexml.replace("<" + self._root_name,
+                    "<" + self._root_name + self._namespace)
 
         try:
             doc = libxml2.parseDoc(parsexml)
@@ -738,12 +746,7 @@ class _XMLState(object):
 
 
     def make_xml_stub(self):
-        ret = "<%s" % self._root_name
-        if ":" in self._root_name:
-            ns = self._root_name.split(":")[0]
-            ret += " xmlns:%s='%s'" % (ns, _namespaces[ns])
-        ret += "/>"
-        return ret
+        return "<%s%s/>" % (self._root_name, self._namespace)
 
     def set_relative_object_xpath(self, xpath):
         self._relative_object_xpath = xpath or ""