[Xen-changelog] [xen master] xend/pvscsi: recognize also SCSI CDROM devices

[patchbot@xxxxxxx]

commit 9011c2615c18b92f10cda8d78622e0c2a9e1f846
Author:     Olaf Hering <olaf@xxxxxxxxx>
AuthorDate: Tue Feb 11 15:27:24 2014 +0100
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Thu Mar 27 15:05:52 2014 +0000

    xend/pvscsi: recognize also SCSI CDROM devices
    
    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 <olaf@xxxxxxxxx>
    Acked-by: Matt Wilson <msw@xxxxxxxxxx>
---
 tools/python/xen/util/vscsi_util.py |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

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)
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog