dom0/qvm-block: detect 'connecting' devices as 'connected'

This is needed to not allow connecting the same backend to more than one VMs at
the same time.
This commit is contained in:
Marek Marczykowski 2012-02-14 20:55:51 +01:00
parent a60671c55d
commit 1683a0b815

View File

@ -214,13 +214,21 @@ def block_check_attached(backend_vm, device, backend_xid = None):
device_majorminor = block_name_to_majorminor(device)
for vm_xid in vm_list:
for devid in xs.ls('', '/local/domain/%d/backend/vbd/%s' % (backend_xid, vm_xid)):
(tmp_major, tmp_minor) = (0, 0)
phys_device = xs.read('', '/local/domain/%d/backend/vbd/%s/%s/physical-device' % (backend_xid, vm_xid, devid))
if phys_device is None or not phys_device.find(':'):
# Skip not-phy devices
continue
if phys_device and phys_device.find(':'):
(tmp_major, tmp_minor) = phys_device.split(":")
tmp_major = int(tmp_major, 16)
tmp_minor = int(tmp_minor, 16)
else:
# perhaps not ready yet - check params
dev_params = xs.read('', '/local/domain/%d/backend/vbd/%s/%s/params' % (backend_xid, vm_xid, devid))
if not dev_params or not dev_params.startswith('/dev/'):
# Skip not-phy devices
continue
else:
(tmp_major, tmp_minor) = block_name_to_majorminor(dev_params.lstrip('/dev/'))
if (tmp_major, tmp_minor) == device_majorminor:
vm_name = xl_ctx.domid_to_name(int(vm_xid))
frontend = block_devid_to_name(int(devid))