Received: from [140.186.70.92] (port=55282 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ov8Mz-0000CB-LD for qemu-devel@nongnu.org; Mon, 13 Sep 2010 08:42:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Ov8My-0004Kt-EK for qemu-devel@nongnu.org; Mon, 13 Sep 2010 08:42:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:9169) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Ov8My-0004Km-7a for qemu-devel@nongnu.org; Mon, 13 Sep 2010 08:42:48 -0400 From: Kevin Wolf Date: Mon, 13 Sep 2010 14:42:45 +0200 Message-Id: <1284381771-7333-8-git-send-email-kwolf@redhat.com> In-Reply-To: <1284381771-7333-1-git-send-email-kwolf@redhat.com> References: <1284381771-7333-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [STABLE 0.13][PATCH 07/13] raw-posix: Don't use file name for host_cdrom detection on Linux List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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; -- 1.7.2.2