diff options
| author | Olaf Hering <olaf@aepfle.de> | 2012-11-13 18:00:51 +0000 |
|---|---|---|
| committer | Olaf Hering <olaf@aepfle.de> | 2012-11-13 18:00:51 +0000 |
| commit | 7da2ea18d92452de391faf4232b01a62ac8fc3d9 (patch) | |
| tree | 37327e386c2ea0b9b53307ca59e3387006309cdf | |
| parent | 2eb37e5be47597435a017bf3513c0a1c322c44f2 (diff) | |
| download | xen-7da2ea18d92452de391faf4232b01a62ac8fc3d9.tar.gz xen-7da2ea18d92452de391faf4232b01a62ac8fc3d9.tar.bz2 xen-7da2ea18d92452de391faf4232b01a62ac8fc3d9.zip | |
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>
xen-unstable changeset: 26009:2dbfa4d2e107
Backport-requested-by: Olaf Hering <olaf@aepfle.de>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
| -rw-r--r-- | tools/python/xen/util/vscsi_util.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/python/xen/util/vscsi_util.py b/tools/python/xen/util/vscsi_util.py index da09d46727..38cdff4f2b 100644 --- a/tools/python/xen/util/vscsi_util.py +++ b/tools/python/xen/util/vscsi_util.py @@ -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) |