From patchwork Tue Jan 12 15:29:12 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 42733 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 32E50B7C48 for ; Wed, 13 Jan 2010 02:31:46 +1100 (EST) Received: from localhost ([127.0.0.1]:51866 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NUiic-0001eQ-Vs for incoming@patchwork.ozlabs.org; Tue, 12 Jan 2010 10:31:43 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NUigR-00019b-Hm for qemu-devel@nongnu.org; Tue, 12 Jan 2010 10:29:27 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NUigM-00018k-6u for qemu-devel@nongnu.org; Tue, 12 Jan 2010 10:29:26 -0500 Received: from [199.232.76.173] (port=52681 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NUigM-00018g-0J for qemu-devel@nongnu.org; Tue, 12 Jan 2010 10:29:22 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55415) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NUigL-0005wJ-IQ for qemu-devel@nongnu.org; Tue, 12 Jan 2010 10:29:21 -0500 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 o0CFTDYb020915 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 12 Jan 2010 10:29:13 -0500 Received: from localhost.localdomain (dhcp-100-19-163.bos.redhat.com [10.16.19.163]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o0CFTCox016314; Tue, 12 Jan 2010 10:29:13 -0500 From: Cole Robinson To: qemu-devel@nongnu.org Date: Tue, 12 Jan 2010 10:29:12 -0500 Message-Id: <1263310152-4443-2-git-send-email-crobinso@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: hch@lst.de, Cole Robinson Subject: [Qemu-devel] [PATCH v2] raw-posix: Detect legacy floppy 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 legacy floppy detection is hardcoded based on source file name. Make this smarter by attempting a floppy specific ioctl. v2: Give ioctl check higher priority than filename check, s/IDE/legacy/ 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 b7254d8..d67280e 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -1055,9 +1055,25 @@ static int floppy_open(BlockDriverState *bs, const char *filename, int flags) static int floppy_probe_device(const char *filename) { + int fd, ret, prio; + struct floppy_struct fdparam; + if (strstart(filename, "/dev/fd", NULL)) - return 100; - return 0; + prio = 50; + + fd = open(filename, O_RDONLY | O_NONBLOCK); + if (fd < 0) { + goto out; + } + + /* Attempt to detect via a floppy specific ioctl */ + ret = ioctl(fd, FDGETPRM, &fdparam); + if (!(ret < 0 && errno == EINVAL)) + prio = 100; + + close(fd); +out: + return prio; }