From: Keir Fraser Date: Fri, 13 Mar 2009 07:38:47 +0000 (+0000) Subject: xend: Fix xm scsi-attach for host OS without lsscsi X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~13992^2~74 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b82b238521d58f9551c2b4c0307ad948fc3f18a4;p=xen.git xend: Fix xm scsi-attach for host OS without lsscsi In the case of a host OS without lsscsi command, xm scsi-attach command fails even if you specify existing SCSI device. Signed-off-by: Masaki Kanno --- diff --git a/tools/python/xen/util/vscsi_util.py b/tools/python/xen/util/vscsi_util.py index 8c87c119dd..7f71bf10a0 100644 --- a/tools/python/xen/util/vscsi_util.py +++ b/tools/python/xen/util/vscsi_util.py @@ -152,7 +152,9 @@ def vscsi_get_hctl_and_devname_by(target, scsi_devices = None): elif target.startswith('/dev/'): scsi_devices = _vscsi_get_scsidevices_by_lsscsi("| grep %s" % target) else: - scsi_devices = vscsi_get_scsidevices() + scsi_devices = _vscsi_get_scsidevices_by_lsscsi("") + if not scsi_devices: + scsi_devices = _vscsi_get_scsidevices_by_sysfs() if len(target.split(':')) == 4: return _vscsi_get_devname_by(target, scsi_devices)