diff --git a/0018-nodedev-Handle-busted-system-XML.patch b/0018-nodedev-Handle-busted-system-XML.patch new file mode 100644 index 0000000..0f3fb40 --- /dev/null +++ b/0018-nodedev-Handle-busted-system-XML.patch @@ -0,0 +1,125 @@ +From: Cole Robinson +Date: Thu, 26 Mar 2015 18:04:23 -0400 +Subject: [PATCH virt-manager] nodedev: Handle busted 'system' XML + +Libvirt can generated invalid XML for the system nodedev device: + +https://bugzilla.redhat.com/show_bug.cgi?id=1184131 + +This hits at least two people, so catch this specific case, but the +real fix is libvirt not outputing busted XML. + +(cherry picked from commit e125aa69d8024fddb72dde9371f172061f388160) +--- + tests/nodedev.py | 32 ++++++++++++++++++++++++++++++++ + virtinst/nodedev.py | 4 ++++ + virtinst/xmlbuilder.py | 13 +++++++++++++ + 3 files changed, 49 insertions(+) + +diff --git a/tests/nodedev.py b/tests/nodedev.py +index f93a6cf..28e0603 100644 +--- a/tests/nodedev.py ++++ b/tests/nodedev.py +@@ -1,3 +1,5 @@ ++# encoding=utf-8 ++# + # Copyright (C) 2013 Red Hat, Inc. + # + # This program is free software; you can redistribute it and/or modify +@@ -37,6 +39,26 @@ unknown_xml = """ + + """ + ++# Requires XML_SANITIZE to parse correctly, see bug 1184131 ++funky_chars_xml = """ ++ ++ computer ++ ++ ++ LENOVOá ++ ThinkPad T61 ++ L3B2616 ++ 97e80381-494f-11cb-8e0e-cbc168f7d753 ++ ++ ++ LENOVO ++ 7LET51WW (1.21 ) ++ 08/22/2007 ++ ++ ++ ++""" ++ + + class TestNodeDev(unittest.TestCase): + +@@ -80,6 +102,16 @@ class TestNodeDev(unittest.TestCase): + "name": "computer", "parent": None} + self._testCompare(devname, vals) + ++ def testFunkyChars(self): ++ vals = {"hw_vendor": "LENOVO", "hw_version": "ThinkPad T61", ++ "hw_serial": "L3B2616", ++ "hw_uuid": "97e80381-494f-11cb-8e0e-cbc168f7d753", ++ "fw_vendor": "LENOVO", "fw_version": "7LET51WW (1.21 )", ++ "fw_date": "08/22/2007", ++ "device_type": NodeDevice.CAPABILITY_TYPE_SYSTEM, ++ "name": "computer", "parent": None} ++ self._testCompare(None, vals, funky_chars_xml) ++ + def testNetDevice1(self): + devname = "net_00_1c_25_10_b1_e4" + vals = {"name": "net_00_1c_25_10_b1_e4", "parent": "pci_8086_1049", +diff --git a/virtinst/nodedev.py b/virtinst/nodedev.py +index 013fee2..5b803b8 100644 +--- a/virtinst/nodedev.py ++++ b/virtinst/nodedev.py +@@ -102,6 +102,10 @@ class NodeDevice(XMLBuilder): + + _XML_ROOT_NAME = "device" + ++ # Libvirt can generate bogus 'system' XML: ++ # https://bugzilla.redhat.com/show_bug.cgi?id=1184131 ++ _XML_SANITIZE = True ++ + name = XMLProperty("./name") + parent = XMLProperty("./parent") + device_type = XMLProperty("./capability/@type") +diff --git a/virtinst/xmlbuilder.py b/virtinst/xmlbuilder.py +index ff64c16..6f701b7 100644 +--- a/virtinst/xmlbuilder.py ++++ b/virtinst/xmlbuilder.py +@@ -23,6 +23,7 @@ import copy + import logging + import os + import re ++import string # pylint: disable=deprecated-module + + import libxml2 + +@@ -760,6 +761,14 @@ class XMLBuilder(object): + # Name of the root XML element + _XML_ROOT_NAME = None + ++ # In some cases, libvirt can incorrectly generate unparseable XML. ++ # These are libvirt bugs, but this allows us to work around it in ++ # for specific XML classes. ++ # ++ # Example: nodedev 'system' XML: ++ # https://bugzilla.redhat.com/show_bug.cgi?id=1184131 ++ _XML_SANITIZE = False ++ + def __init__(self, conn, parsexml=None, parsexmlnode=None, + parent_xpath=None, relative_object_xpath=None): + """ +@@ -774,6 +783,10 @@ class XMLBuilder(object): + """ + self.conn = conn + ++ if self._XML_SANITIZE: ++ parsexml = parsexml.decode('ascii', 'ignore').encode('ascii') ++ parsexml = "".join([c for c in parsexml if c in string.printable]) ++ + self._propstore = {} + self._proporder = [] + self._xmlstate = _XMLState(self._XML_ROOT_NAME, diff --git a/0019-addstorage-Clarify-that-VM-will-fail-if-cant-set-pat.patch b/0019-addstorage-Clarify-that-VM-will-fail-if-cant-set-pat.patch new file mode 100644 index 0000000..e40c327 --- /dev/null +++ b/0019-addstorage-Clarify-that-VM-will-fail-if-cant-set-pat.patch @@ -0,0 +1,23 @@ +From: Cole Robinson +Date: Sun, 3 May 2015 17:33:26 -0400 +Subject: [PATCH virt-manager] addstorage: Clarify that VM will fail if cant + set path search perms + +https://bugzilla.redhat.com/show_bug.cgi?id=1181025 +(cherry picked from commit cc67f8f194e1d7469f9a8d012754c39e986a74f0) +--- + virtManager/addstorage.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/virtManager/addstorage.py b/virtManager/addstorage.py +index 91cce73..8e43452 100644 +--- a/virtManager/addstorage.py ++++ b/virtManager/addstorage.py +@@ -172,6 +172,7 @@ class vmmAddStorage(vmmGObjectUI): + if path not in broken_paths: + continue + details += "%s : %s\n" % (path, error) ++ details += "\nIt is very likely the VM fill fail to start up." + + logging.debug("Permission errors:\n%s", details) + diff --git a/virt-manager.spec b/virt-manager.spec index e5dc37b..4e7e137 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -28,7 +28,7 @@ Name: virt-manager Version: 1.1.0 -Release: 8.git%{gitcommit}%{_extra_release} +Release: 9.git%{gitcommit}%{_extra_release} %define verrel %{version}-%{release} Summary: Virtual Machine Manager @@ -72,6 +72,10 @@ Patch0015: 0015-create-Fix-regression-in-ppc64-enablement-patch.patch # Fix domcapabilities regression in previous build Patch0016: 0016-domcapabilities-Actually-import-logging.patch Patch0017: 0017-pylint-Ignore-new-warnings.patch +# nodedev: Handle busted 'system' XML (bz #1217912) +Patch0018: 0018-nodedev-Handle-busted-system-XML.patch +# Clarify emulator search permission failure message (bz #1181025) +Patch0019: 0019-addstorage-Clarify-that-VM-will-fail-if-cant-set-pat.patch Requires: virt-manager-common = %{verrel} @@ -171,6 +175,10 @@ machine). # Fix domcapabilities regression in previous build %patch0016 -p1 %patch0017 -p1 +# nodedev: Handle busted 'system' XML (bz #1217912) +%patch0018 -p1 +# Clarify emulator search permission failure message (bz #1181025) +%patch0019 -p1 %build %if %{qemu_user} @@ -276,6 +284,10 @@ fi %changelog +* Sat Jun 06 2015 Cole Robinson - 1.1.0-9.git310f6527 +- nodedev: Handle busted 'system' XML (bz #1217912) +- Clarify emulator search permission failure message (bz #1181025) + * Mon Apr 20 2015 Cole Robinson - 1.1.0-8.git310f6527 - Fix domcapabilities regression in previous build