diff options
| author | Cole Robinson <crobinso@redhat.com> | 2022-01-21 12:44:33 -0500 |
|---|---|---|
| committer | Cole Robinson <crobinso@redhat.com> | 2022-01-21 13:20:46 -0500 |
| commit | 6a83eae30f30e0e9d32fcfa6441c1bcf11ba8bed (patch) | |
| tree | 38ed5490f000bc311fed18b7e346022c02bdbdf6 | |
| parent | d0664bc521ce6d9d479e0a583f33941685a2e4fa (diff) | |
| download | virt-manager-6a83eae30f30e0e9d32fcfa6441c1bcf11ba8bed.tar.gz | |
virtManager: nodedev: Handle failure to lookup drm parent
Apparently nodedev drm XML can link to a parent device that we can't
look up?
We shouldn't be trying to do the full address string compare anyways,
so just try the name lookup, which would improve the error here too
Fixes: #328
Signed-off-by: Cole Robinson <crobinso@redhat.com>
| -rw-r--r-- | virtManager/object/nodedev.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/virtManager/object/nodedev.py b/virtManager/object/nodedev.py index 982956d9..68f05b14 100644 --- a/virtManager/object/nodedev.py +++ b/virtManager/object/nodedev.py @@ -35,9 +35,16 @@ def _pretty_name(xmlobj): return _usb_pretty_name(xmlobj) if xmlobj.device_type == "drm": - parent = NodeDevice.lookupNodedevFromString( + parent = NodeDevice.lookupNodedevByName( xmlobj.conn, xmlobj.parent) - return "%s (%s)" % (_pretty_name(parent), xmlobj.drm_type) + + # https://github.com/virt-manager/virt-manager/issues/328 + # Apparently we can't depend on successful parent lookup + pretty_parent = xmlobj.parent + if parent: + pretty_parent = _pretty_name(parent) + + return "%s (%s)" % (pretty_parent, xmlobj.drm_type) return xmlobj.name # pragma: no cover |