From: Tomasz Wroblewski <tomasz.wroblewski@citrix.com>
Date: Tue, 26 Jan 2010 14:35:22 +0000 (+0000)
Subject: Remove cdrom discovery code from qemu-dm-wrapper -> logic moved to xenmgr
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=96bbdfea3ebff10f8341b6ada5fc3408096b9beb;p=xenclient%2Ftoolstack.git

Remove cdrom discovery code from qemu-dm-wrapper -> logic moved to xenmgr
---

diff --git a/scripts/qemu-dm-wrapper b/scripts/qemu-dm-wrapper
index 1cd4948..ccd5b4f 100755
--- a/scripts/qemu-dm-wrapper
+++ b/scripts/qemu-dm-wrapper
@@ -23,19 +23,9 @@ export QEMU_ALSA_VOL_CTRL=vm-${ALSA_VMID}
 
 name="qemu-$DOMID"
 
-# let's find the bsg device if there is one.
-{
-    BSG_DEVICE=/dev/bsg/$(grep -B2 CD-ROM /proc/scsi/scsi | head -n 1 | sed -e 's/^.*scsi\([0-9]\).* \([0-9]\+\) .* \([0-9]\+\) .* \([0-9]\+\)/\1:\2:\3:\4/g' -e 's/0\([0-9]\)/\1/g')
-    if [[ -c $BSG_DEVICE ]]; then
-        CDROM_PT_ARG="-cdrom-pt $BSG_DEVICE"
-    else
-        CDROM_PT_ARG=""
-    fi
-} >/dev/null 2>&1
-
 /usr/bin/ctxusb-wrapper "$DOMID"
 
 logger -t $name "Using domid: $DOMID"
-logger -t $name "Arguments: $* $CDROM_PT_ARG"
+logger -t $name "Arguments: $*"
 xenstore-write /local/domain/$DOMID/qemu-pid $$
-exec /usr/lib/xen/bin/qemu-dm -name qemu-$DOMID $* $CDROM_PT_ARG 2>&1 | logger -t "qemu-dm-$DOMID"
+exec /usr/lib/xen/bin/qemu-dm -name qemu-$DOMID $* 2>&1 | logger -t "qemu-dm-$DOMID"