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

Update ext/pci to new api

Browse Source 
Signed-off-by: Bahtiar `kalkin-` Gadimov <bahtiar@gadimov.de>
This commit is contained in:
Bahtiar `kalkin-` Gadimov 2017-04-01 01:32:58 +02:00
parent 2a6266887e
commit 0b3aebac9f
No known key found for this signature in database
GPG Key ID: 07799AE179ED4FD4
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qubes/ext/pci.py
View File

@ -122,7 +122,6 @@ def _device_desc(hostdev_xml):
) )
class PCIDevice(qubes.devices.DeviceInfo): class PCIDevice(qubes.devices.DeviceInfo):
# pylint: disable=too-few-public-methods # pylint: disable=too-few-public-methods
regex = re.compile( regex = re.compile(
@ -227,6 +226,9 @@ class PCIDeviceExtension(qubes.ext.Extension):
return return
try: try:
device = next(
self.on_device_get_pci(vm, event, device.ident)
)
self.bind_pci_to_pciback(vm.app, device) self.bind_pci_to_pciback(vm.app, device)
vm.libvirt_domain.attachDevice( vm.libvirt_domain.attachDevice(
vm.app.env.get_template('libvirt/devices/pci.xml').render( vm.app.env.get_template('libvirt/devices/pci.xml').render(
@ -246,6 +248,9 @@ class PCIDeviceExtension(qubes.ext.Extension):
# provision in libvirt for extracting device-side BDF; we need it for # provision in libvirt for extracting device-side BDF; we need it for
# qubes.DetachPciDevice, which unbinds driver, not to oops the kernel # qubes.DetachPciDevice, which unbinds driver, not to oops the kernel
device = next(
self.on_device_get_pci(vm, event, device.ident)
)
p = subprocess.Popen(['xl', 'pci-list', str(vm.xid)], p = subprocess.Popen(['xl', 'pci-list', str(vm.xid)],
stdout=subprocess.PIPE) stdout=subprocess.PIPE)
result = p.communicate()[0].decode() result = p.communicate()[0].decode()
@ -270,8 +275,10 @@ class PCIDeviceExtension(qubes.ext.Extension):
@qubes.ext.handler('domain-pre-start') @qubes.ext.handler('domain-pre-start')
def on_domain_pre_start(self, vm, _event, **_kwargs): def on_domain_pre_start(self, vm, _event, **_kwargs):
# Bind pci devices to pciback driver # Bind pci devices to pciback driver
for pci in vm.devices['pci'].attached(): for assignment in vm.devices['pci'].persistent():
self.bind_pci_to_pciback(vm.app, pci) device = next(
self.on_device_get_pci(vm, _event, assignment.ident))
self.bind_pci_to_pciback(vm.app, device)
@staticmethod @staticmethod
def bind_pci_to_pciback(app, device): def bind_pci_to_pciback(app, device):