From patchwork Wed Jan 13 23:45:44 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 42840 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 7340CB7CBC for ; Thu, 14 Jan 2010 10:52:33 +1100 (EST) Received: from localhost ([127.0.0.1]:60220 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NVCzd-00085N-WF for incoming@patchwork.ozlabs.org; Wed, 13 Jan 2010 18:51:18 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NVCua-0006R6-Jy for qemu-devel@nongnu.org; Wed, 13 Jan 2010 18:46:04 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NVCuV-0006O5-Lr for qemu-devel@nongnu.org; Wed, 13 Jan 2010 18:46:04 -0500 Received: from [199.232.76.173] (port=55204 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NVCuV-0006Nr-Ap for qemu-devel@nongnu.org; Wed, 13 Jan 2010 18:45:59 -0500 Received: from mx1.redhat.com ([209.132.183.28]:2914) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NVCuU-0006Dg-RC for qemu-devel@nongnu.org; Wed, 13 Jan 2010 18:45:59 -0500 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o0DNjumL021693 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 13 Jan 2010 18:45:56 -0500 Received: from localhost.localdomain (vpn-9-82.rdu.redhat.com [10.11.9.82]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o0DNjjXM020369; Wed, 13 Jan 2010 18:45:47 -0500 From: Cole Robinson To: qemu-devel@nongnu.org Date: Wed, 13 Jan 2010 18:45:44 -0500 Message-Id: <1263426345-13558-1-git-send-email-crobinso@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Cole Robinson Subject: [Qemu-devel] [PATCH v3] raw-posix: Detect CDROM via ioctl 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 Current CDROM detection is hardcoded based on source file name. Make this smarter 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 Signed-off-by: Cole Robinson --- 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)