mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 10:11:27 +01:00
xend/pvscsi: fix usage of persistant device names for SCSI devices
Currently the callers of vscsi_get_scsidevices() do not pass a mask string. This will call "lsscsi -g '[]'", which causes a lsscsi syntax error. As a result the sysfs parser _vscsi_get_scsidevices() is used. But this parser is broken and the specified names in the config file are not found. Using a mask '*' if no mask was given will call lsscsi correctly and the following config is parsed correctly: vscsi=[ '/dev/sg3, 0:0:0:0', '/dev/disk/by-id/wwn-0x600508b4000cf1c30000800000410000, 0:0:0:1' ] Signed-off-by: Olaf Hering <olaf@aepfle.de> Acked-by: Ian Campbell <ian.campbell@citrix.com> Committed-by: Ian Campbell <ian.campbell@citrix.com>
This commit is contained in:
1 parent
a6046ec01a
commit
65ddfc5975
1 file changed
+2
-2
@@ -150,7 +150,7 @@ def _vscsi_get_scsidevices_by_sysfs():
|
||||
return devices
|
||||
|
||||
|
||||
def vscsi_get_scsidevices(mask=""):
|
||||
def vscsi_get_scsidevices(mask="*"):
|
||||
""" get all scsi devices information """
|
||||
|
||||
devices = _vscsi_get_scsidevices_by_lsscsi("[%s]" % mask)
|
||||
@@ -279,7 +279,7 @@ def get_scsi_device(pHCTL):
|
||||
return _make_scsi_record(scsi_info)
|
||||
return None
|
||||
|
||||
def get_all_scsi_devices(mask=""):
|
||||
def get_all_scsi_devices(mask="*"):
|
||||
scsi_records = []
|
||||
for scsi_info in vscsi_get_scsidevices(mask):
|
||||
scsi_record = _make_scsi_record(scsi_info)
|
||||
|
||||