From 375d40709e55e132f7fe9d83acd4aa6e30d43971 Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Thu, 2 Sep 2010 17:48:32 +0200 Subject: raw-posix: Don't use file name for host_cdrom detection on Linux On Linux, we have code to detect CD-ROMs using an ioctl. We shouldn't lose anything but false positives by removing the check for a /dev/cd* path. Signed-off-by: Kevin Wolf (cherry picked from commit 897804d6299af372a43110799cbe1d6804d5e1bc) --- block/raw-posix.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/block/raw-posix.c b/block/raw-posix.c index 72fb8ce..0fce449 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -1154,9 +1154,6 @@ static int cdrom_probe_device(const char *filename) int fd, ret; int prio = 0; - if (strstart(filename, "/dev/cd", NULL)) - prio = 50; - fd = open(filename, O_RDONLY | O_NONBLOCK); if (fd < 0) { goto out; -- cgit v1.1