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

core: ignore error when PCI device already "detached"

Browse Source 
This can be the case at startup, when all network devices are connected
to pciback module by initramfs.
This commit is contained in:
Marek Marczykowski-Górecki 2013-08-31 00:29:11 +02:00
parent 5b0b62ee5b
commit 7e355c5dad
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core-modules/000QubesVm.py
View File

@ -1597,7 +1597,14 @@ class QubesVm(object):
# Bind pci devices to pciback driver # Bind pci devices to pciback driver
for pci in self.pcidevs: for pci in self.pcidevs:
nd = vmm.libvirt_conn.nodeDeviceLookupByName('pci_0000_' + pci.replace(':','_').replace('.','_')) nd = vmm.libvirt_conn.nodeDeviceLookupByName('pci_0000_' + pci.replace(':','_').replace('.','_'))
try:
nd.dettach() nd.dettach()
except libvirt.libvirtError:
if libvirt.virGetLastError()[0] == libvirt.VIR_ERR_INTERNAL_ERROR:
# allready detached
pass
else:
raise
self.libvirt_domain.createWithFlags(libvirt.VIR_DOMAIN_START_PAUSED) self.libvirt_domain.createWithFlags(libvirt.VIR_DOMAIN_START_PAUSED)