Received: from [140.186.70.92] (port=33746 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OrC34-0001Pl-7n for qemu-devel@nongnu.org; Thu, 02 Sep 2010 11:49:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OrC33-0003cF-6F for qemu-devel@nongnu.org; Thu, 02 Sep 2010 11:49:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45989) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OrC32-0003bz-U8 for qemu-devel@nongnu.org; Thu, 02 Sep 2010 11:49:57 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o82FntCB008845 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 2 Sep 2010 11:49:56 -0400 From: Kevin Wolf Date: Thu, 2 Sep 2010 17:50:09 +0200 Message-Id: <1283442609-11902-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH] 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: qemu-devel@nongnu.org Cc: kwolf@redhat.com 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 --- 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 240d84d..a3500f1 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -1159,9 +1159,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