From: Olaf Hering Subject: [PATCH] xend/pvscsi: recognize also SCSI CDROM devices Date: Tue, 11 Feb 2014 15:27:24 +0100 Message-ID: <1392128844-18318-1-git-send-email-olaf@aepfle.de> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: Olaf Hering , Ian.Jackson@eu.citrix.com, Ian.Campbell@citrix.com List-Id: xen-devel@lists.xenproject.org Attaching a CDROM device with 'xm scsi-attach domU /dev/sr0 0:0:0:0' fails because for some reason the sr driver was not handled at all in the match list. With the change the above command succeeds and the device is attached. Signed-off-by: Olaf Hering --- Once this change gets commited, it should also be backported to the maintained trees which contains these fixes (4.3+): 89bb46e xend/pvscsi: update sysfs parser for Linux 3.0 65ddfc5 xend/pvscsi: fix usage of persistant device names for SCSI devices a6046ec xend/pvscsi: fix passing of SCSI control LUNs tools/python/xen/util/vscsi_util.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/python/xen/util/vscsi_util.py b/tools/python/xen/util/vscsi_util.py index 5872e65..a4f5ad3 100644 --- a/tools/python/xen/util/vscsi_util.py +++ b/tools/python/xen/util/vscsi_util.py @@ -66,6 +66,9 @@ def _vscsi_get_hctl_by(phyname, scsi_devices): if re.match('/dev/sd[a-z]+([1-9]|1[0-5])?$', phyname): # sd driver name = re.sub('(^/dev/)|([1-9]|1[0-5])?$', '', phyname) + elif re.match('/dev/sr[0-9]+$', phyname): + # sr driver + name = re.sub('^/dev/', '', phyname) elif re.match('/dev/sg[0-9]+$', phyname): # sg driver name = re.sub('^/dev/', '', phyname)