From patchwork Mon Sep 13 12:42:45 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 64588 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 893EEB6F10 for ; Mon, 13 Sep 2010 22:46:50 +1000 (EST) Received: from localhost ([127.0.0.1]:33173 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ov8Qp-00028p-FZ for incoming@patchwork.ozlabs.org; Mon, 13 Sep 2010 08:46:47 -0400 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 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o8DCgkiX002823 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 13 Sep 2010 08:42:46 -0400 Received: from dhcp-5-188.str.redhat.com (vpn2-9-36.ams2.redhat.com [10.36.9.36]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o8DCgUmL027971; Mon, 13 Sep 2010 08:42:45 -0400 From: Kevin Wolf To: anthony@codemonkey.ws 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> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [STABLE 0.13][PATCH 07/13] raw-posix: Don't use file name for host_cdrom detection on Linux X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@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;