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

block: trigger QubesDB watches after attaching/detaching device

Browse Source 
Since libvirt do not support such events (at least for libxl driver), we
need some way to notify qubes-manager when device is attached/detached.
Use the same protocol as for connect/disconnect but on the target
domain.
This commit is contained in:
Marek Marczykowski-Górecki 2015-04-14 23:08:52 +02:00
parent e1da1fb3c1
commit 868ee83093
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/qubesutils.py
View File

@ -420,6 +420,13 @@ def block_attach(qvmc, vm, device, frontend=None, mode="w", auto_detach=False, w
if backend_vm.qid != 0: if backend_vm.qid != 0:
SubElement(disk, 'backenddomain').set('name', device['vm']) SubElement(disk, 'backenddomain').set('name', device['vm'])
vm.libvirt_domain.attachDevice(etree.tostring(disk, encoding='utf-8')) vm.libvirt_domain.attachDevice(etree.tostring(disk, encoding='utf-8'))
try:
# trigger watches to update device status
# FIXME: this should be removed once libvirt will report such
# events itself
vm.qdb.write('/qubes-block-devices', '')
except Error:
pass
def block_detach(vm, frontend = "xvdi"): def block_detach(vm, frontend = "xvdi"):
@ -437,6 +444,13 @@ def block_detach(vm, frontend = "xvdi"):
"qubes_base_dir"]): "qubes_base_dir"]):
continue continue
vm.libvirt_domain.detachDevice(etree.tostring(disk, encoding='utf-8')) vm.libvirt_domain.detachDevice(etree.tostring(disk, encoding='utf-8'))
try:
# trigger watches to update device status
# FIXME: this should be removed once libvirt will report such
# events itself
vm.qdb.write('/qubes-block-devices', '')
except Error:
pass
def block_detach_all(vm): def block_detach_all(vm):
""" Detach all non-system devices""" """ Detach all non-system devices"""