Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prevent 'qubesd' for crashing if any device backend is not available

Browse Source
This commit is contained in:
Frédéric Pierret (fepitre) 2019-07-20 15:27:09 +02:00
parent aa931fdbf7
commit 74f8d4531e
No known key found for this signature in database
GPG Key ID: 484010B5CDC576E2
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qubes/vm/__init__.py
View File

@ -268,6 +268,7 @@ class BaseVM(qubes.PropertyHolder):
for option in node.xpath('./option'): for option in node.xpath('./option'):
options[option.get('name')] = option.text options[option.get('name')] = option.text
try:
device_assignment = qubes.devices.DeviceAssignment( device_assignment = qubes.devices.DeviceAssignment(
self.app.domains[node.get('backend-domain')], self.app.domains[node.get('backend-domain')],
node.get('id'), node.get('id'),
@ -275,6 +276,11 @@ class BaseVM(qubes.PropertyHolder):
persistent=True persistent=True
) )
self.devices[devclass].load_persistent(device_assignment) self.devices[devclass].load_persistent(device_assignment)
except KeyError:
msg = "{}: Cannot find backend domain '{}' for device type {} '{}'".format(self.name, node.get(
'backend-domain'), devclass, node.get('id'))
self.log.info(msg)
continue
# tags # tags
for node in self.xml.xpath('./tags/tag'): for node in self.xml.xpath('./tags/tag'):