From patchwork Mon Sep 13 12:42:45 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [STABLE, 0.13, 07/13] raw-posix: Don't use file name for host_cdrom detection on Linux Date: Mon, 13 Sep 2010 02:42:45 -0000 From: Kevin Wolf X-Patchwork-Id: 64588 Message-Id: <1284381771-7333-8-git-send-email-kwolf@redhat.com> To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org 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 files changed, 0 insertions(+), 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;