aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCole Robinson <crobinso@redhat.com>2010-01-14 11:19:41 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2010-01-19 16:31:03 -0600
commit2ebf7c4b82f7b569cb74e9641968bf4a1da25d3d (patch)
treed71b83edcb091790ef25b18670a08bd95ecbd9b5
parent3baf720e6b920d583ce2834d05e5a4e9603a1d56 (diff)
downloadqemu-2ebf7c4b82f7b569cb74e9641968bf4a1da25d3d.zip
qemu-2ebf7c4b82f7b569cb74e9641968bf4a1da25d3d.tar.gz
qemu-2ebf7c4b82f7b569cb74e9641968bf4a1da25d3d.tar.bz2
raw-posix: Detect legacy floppy via ioctl on linux
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 <crobinso@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--block/raw-posix.c21
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;
}