|
From: | Anthony Liguori |
Subject: | Re: [Qemu-devel] [PATCH v4] raw-posix: Detect legacy floppy via ioctl on linux |
Date: | Tue, 19 Jan 2010 16:39:19 -0600 |
User-agent: | Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.5) Gecko/20091209 Fedora/3.0-4.fc12 Lightning/1.0pre Thunderbird/3.0 |
On 01/14/2010 10:19 AM, Cole Robinson wrote:
Current legacy floppy detection is hardcoded based on source file name. Make this smarter on linux 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 v4: Explicitly mention that change is linux specific. Signed-off-by: Cole Robinson<address@hidden>
Applied. Thanks. Regards, Anthony Liguori
--- 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; }
[Prev in Thread] | Current Thread | [Next in Thread] |