From patchwork Thu Jan 14 16:19:40 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 42903 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 992D4B7C7E for ; Fri, 15 Jan 2010 03:26:15 +1100 (EST) Received: from localhost ([127.0.0.1]:37747 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NVSVz-0008QX-U9 for incoming@patchwork.ozlabs.org; Thu, 14 Jan 2010 11:25:43 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NVSQI-0004xS-Ik for qemu-devel@nongnu.org; Thu, 14 Jan 2010 11:19:50 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NVSQD-0004uQ-Pt for qemu-devel@nongnu.org; Thu, 14 Jan 2010 11:19:49 -0500 Received: from [199.232.76.173] (port=51996 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NVSQD-0004uG-AI for qemu-devel@nongnu.org; Thu, 14 Jan 2010 11:19:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:1038) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NVSQC-0008Om-Nw for qemu-devel@nongnu.org; Thu, 14 Jan 2010 11:19:45 -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 o0EGJgxK017200 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 14 Jan 2010 11:19:43 -0500 Received: from localhost.localdomain (vpn-9-180.rdu.redhat.com [10.11.9.180]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o0EGJfFd011270; Thu, 14 Jan 2010 11:19:42 -0500 From: Cole Robinson To: qemu-devel@nongnu.org Date: Thu, 14 Jan 2010 11:19:40 -0500 Message-Id: <1263485981-20977-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 v4] raw-posix: Detect CDROM via ioctl 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 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 --- 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)