From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NXMjm-0004R2-8f for qemu-devel@nongnu.org; Tue, 19 Jan 2010 17:39:50 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NXMjh-0004OR-Ov for qemu-devel@nongnu.org; Tue, 19 Jan 2010 17:39:49 -0500 Received: from [199.232.76.173] (port=43477 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NXMjh-0004OJ-B7 for qemu-devel@nongnu.org; Tue, 19 Jan 2010 17:39:45 -0500 Received: from e36.co.us.ibm.com ([32.97.110.154]:53895) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NXMjh-0004rs-0h for qemu-devel@nongnu.org; Tue, 19 Jan 2010 17:39:45 -0500 Received: from d03relay05.boulder.ibm.com (d03relay05.boulder.ibm.com [9.17.195.107]) by e36.co.us.ibm.com (8.14.3/8.13.1) with ESMTP id o0JMb0T1027650 for ; Tue, 19 Jan 2010 15:37:00 -0700 Received: from d03av03.boulder.ibm.com (d03av03.boulder.ibm.com [9.17.195.169]) by d03relay05.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o0JMdQuo142460 for ; Tue, 19 Jan 2010 15:39:26 -0700 Received: from d03av03.boulder.ibm.com (loopback [127.0.0.1]) by d03av03.boulder.ibm.com (8.14.3/8.13.1/NCO v10.0 AVout) with ESMTP id o0JMdQAe013432 for ; Tue, 19 Jan 2010 15:39:26 -0700 Message-ID: <4B56349D.4040700@linux.vnet.ibm.com> Date: Tue, 19 Jan 2010 16:39:25 -0600 From: Anthony Liguori MIME-Version: 1.0 Subject: Re: [Qemu-devel] [PATCH v4] raw-posix: Detect CDROM via ioctl on linux References: <1263485981-20977-1-git-send-email-crobinso@redhat.com> In-Reply-To: <1263485981-20977-1-git-send-email-crobinso@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Cole Robinson Cc: qemu-devel@nongnu.org On 01/14/2010 10:19 AM, Cole Robinson wrote: > Current CDROM detection is hardcoded based on source file name. > Make this smarter on linux by attempting a CDROM specific ioctl. > > This makes '-cdrom /dev/sr0' succeed with no media present. > > v2: > Give ioctl check higher priority than filename check. > > v3: > Actually initialize 'prio' variable. > Check for ioctl success rather than absence of specific failure. > > v4: > Explicitly mention that change is linux specific. > > Signed-off-by: Cole Robinson > Applied. Thanks. Regards, Anthony Liguori > --- > block/raw-posix.c | 20 ++++++++++++++++++-- > 1 files changed, 18 insertions(+), 2 deletions(-) > > diff --git a/block/raw-posix.c b/block/raw-posix.c > index 5a6a22b..a2c7508 100644 > --- a/block/raw-posix.c > +++ b/block/raw-posix.c > @@ -1140,9 +1140,25 @@ static int cdrom_open(BlockDriverState *bs, const char *filename, int flags) > > static int cdrom_probe_device(const char *filename) > { > + int fd, ret; > + int prio = 0; > + > 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) > + prio = 100; > + > + close(fd); > +out: > + return prio; > } > > static int cdrom_is_inserted(BlockDriverState *bs) >