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

Merge remote-tracking branch 'origin/pr/271'

Browse Source 
* origin/pr/271:
  Fix too long line
  Prevent 'qubesd' for crashing if any device backend is not available
This commit is contained in:
Marek Marczykowski-Górecki 2019-07-31 17:23:20 +02:00
commit 205f6215b2
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
qubes/vm/__init__.py
View File

@ -268,13 +268,20 @@ class BaseVM(qubes.PropertyHolder):
for option in node.xpath('./option'):
options[option.get('name')] = option.text
device_assignment = qubes.devices.DeviceAssignment(
self.app.domains[node.get('backend-domain')],
node.get('id'),
options,
persistent=True
)
self.devices[devclass].load_persistent(device_assignment)
try:
device_assignment = qubes.devices.DeviceAssignment(
self.app.domains[node.get('backend-domain')],
node.get('id'),
options,
persistent=True
)
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
for node in self.xml.xpath('./tags/tag'):