From patchwork Mon Jan 11 18:30:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 42652 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 BC4F8B6EF4 for ; Tue, 12 Jan 2010 05:32:29 +1100 (EST) Received: from localhost ([127.0.0.1]:59141 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NUP3y-0004My-V3 for incoming@patchwork.ozlabs.org; Mon, 11 Jan 2010 13:32:27 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NUP24-0003pT-Qs for qemu-devel@nongnu.org; Mon, 11 Jan 2010 13:30:28 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NUP20-0003oM-D9 for qemu-devel@nongnu.org; Mon, 11 Jan 2010 13:30:28 -0500 Received: from [199.232.76.173] (port=40187 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NUP20-0003oJ-6G for qemu-devel@nongnu.org; Mon, 11 Jan 2010 13:30:24 -0500 Received: from mx1.redhat.com ([209.132.183.28]:26703) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NUP1z-0002z5-Kj for qemu-devel@nongnu.org; Mon, 11 Jan 2010 13:30:23 -0500 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o0BIULSQ021986 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 11 Jan 2010 13:30:21 -0500 Received: from localhost.localdomain (crobinso2.bos.redhat.com [10.16.16.64]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o0BIUJw5010810; Mon, 11 Jan 2010 13:30:20 -0500 From: Cole Robinson To: qemu-devel@nongnu.org Date: Mon, 11 Jan 2010 13:30:19 -0500 Message-Id: <1263234619-14522-2-git-send-email-crobinso@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Cole Robinson Subject: [Qemu-devel] [PATCH] raw-posix: Detect IDE 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 IDE floppy detection is hardcoded based on source file name. Make this smarter by attempting a floppy specific ioctl. Signed-off-by: Cole Robinson --- block/raw-posix.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/block/raw-posix.c b/block/raw-posix.c index 3ec58d0..5d6b9fb 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -1055,9 +1055,26 @@ static int floppy_open(BlockDriverState *bs, const char *filename, int flags) static int floppy_probe_device(const char *filename) { + int fd, ret; + struct floppy_struct fdparam; + if (strstart(filename, "/dev/fd", NULL)) return 100; - return 0; + + fd = open(filename, O_RDONLY | O_NONBLOCK); + if (fd < 0) { + return 0; + } + + /* Attempt to detect via a floppy specific ioctl */ + if (ioctl(fd, FDGETPRM, &fdparam) < 0 && errno == EINVAL) { + ret = 0; + } else { + ret = 100; + } + + close(fd); + return ret; }