From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NUkH4-0006NM-R5
	for qemu-devel@nongnu.org; Tue, 12 Jan 2010 12:11:22 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NUkGz-0006Gi-Tf
	for qemu-devel@nongnu.org; Tue, 12 Jan 2010 12:11:22 -0500
Received: from [199.232.76.173] (port=51955 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NUkGz-0006GX-Ns
	for qemu-devel@nongnu.org; Tue, 12 Jan 2010 12:11:17 -0500
Received: from verein.lst.de ([213.95.11.210]:49882)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <hch@lst.de>) id 1NUkGz-0002QT-8I
	for qemu-devel@nongnu.org; Tue, 12 Jan 2010 12:11:17 -0500
Date: Tue, 12 Jan 2010 18:11:14 +0100
From: Christoph Hellwig <hch@lst.de>
Subject: Re: [Qemu-devel] [PATCH v2] raw-posix: Detect CDROM via ioctl
Message-ID: <20100112171114.GB31233@lst.de>
References: <1263310152-4443-1-git-send-email-crobinso@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1263310152-4443-1-git-send-email-crobinso@redhat.com>
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Cole Robinson <crobinso@redhat.com>
Cc: qemu-devel@nongnu.org, hch@lst.de

On Tue, Jan 12, 2010 at 10:29:11AM -0500, Cole Robinson wrote:
>  static int cdrom_probe_device(const char *filename)
>  {
> +    int fd, ret, prio;
> +
>      if (strstart(filename, "/dev/cd", NULL))
> -        return 100;
> -    return 0;
> +        prio = 50;
> +
> +    fd = open(filename, O_RDONLY | O_NONBLOCK);
> +    if (fd < 0) {
> +        goto out;
> +    }
> +
> +    /* Attempt to detect via a CDROM specific ioctl */
> +    ret = ioctl(fd, CDROM_DRIVE_STATUS, CDSL_CURRENT);
> +    if (!(ret < 0 && errno == EINVAL))
> +        prio = 100;
> +
> +    close(fd);
> +out:
> +    return prio;
>  }

Looks good.  We'll now get an open each from the cdrom and floppy
drivers for each image we're trying to open, but I guess that should be
fine.