diff --git a/virtManager/libvirtobject.py b/virtManager/libvirtobject.py index 52515b72d..1a7e6c6e0 100644 --- a/virtManager/libvirtobject.py +++ b/virtManager/libvirtobject.py @@ -205,7 +205,7 @@ class vmmLibvirtObject(vmmGObject): return self._xmlobj_to_define def _redefine_helper(self, origxml, newxml): - uihelpers.log_redefine_xml_diff(origxml, newxml) + uihelpers.log_redefine_xml_diff(self, origxml, newxml) if origxml != newxml: self._define(newxml) diff --git a/virtManager/snapshots.py b/virtManager/snapshots.py index f001e79eb..84b2becae 100644 --- a/virtManager/snapshots.py +++ b/virtManager/snapshots.py @@ -491,7 +491,7 @@ class vmmSnapshotPage(vmmGObjectUI): xmlobj.description = desc newxml = xmlobj.get_xml_config() - uihelpers.log_redefine_xml_diff(origxml, newxml) + uihelpers.log_redefine_xml_diff(snap, origxml, newxml) if newxml == origxml: return self.vm.create_snapshot(newxml, redefine=True) diff --git a/virtManager/uihelpers.py b/virtManager/uihelpers.py index e9005a174..10338588d 100644 --- a/virtManager/uihelpers.py +++ b/virtManager/uihelpers.py @@ -1415,9 +1415,11 @@ def exception_is_libvirt_error(e, error): e.get_error_code() == getattr(libvirt, error)) -def log_redefine_xml_diff(origxml, newxml): +def log_redefine_xml_diff(obj, origxml, newxml): + objname = "<%s name=%s>" % (obj.__class__.__name__, obj.get_name()) if origxml == newxml: - logging.debug("Redefine requested, but XML didn't change!") + logging.debug("Redefine requested for %s, but XML didn't change!", + objname) return import difflib @@ -1425,4 +1427,4 @@ def log_redefine_xml_diff(origxml, newxml): newxml.splitlines(1), fromfile="Original XML", tofile="New XML")) - logging.debug("Redefining with XML diff:\n%s", diff) + logging.debug("Redefining %s with XML diff:\n%s", objname, diff)