From patchwork Wed Jan 13 23:45:45 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v3] raw-posix: Detect legacy floppy via ioctl Date: Wed, 13 Jan 2010 13:45:45 -0000 From: Cole Robinson X-Patchwork-Id: 42841 Message-Id: <1263426345-13558-2-git-send-email-crobinso@redhat.com> To: qemu-devel@nongnu.org Cc: Cole Robinson 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/ v3: Actually initialize 'prio' variable Check for ioctl success rather than absence of specific failure Signed-off-by: Cole Robinson --- block/raw-posix.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/block/raw-posix.c b/block/raw-posix.c index a2c7508..eea7e56 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; + int prio = 0; + 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) + prio = 100; + + close(fd); +out: + return prio; }