diff options
| author | Corey Bryant | 2012-08-14 22:43:44 +0200 |
|---|---|---|
| committer | Kevin Wolf | 2012-08-15 10:48:57 +0200 |
| commit | e17408283562be359f16a7e12ddfee7509d6fe11 (patch) | |
| tree | 9f8d0f5755a6946aad67b53cc631501eefa03ab0 /block | |
| parent | qapi: Introduce add-fd, remove-fd, query-fdsets (diff) | |
| download | qemu-e17408283562be359f16a7e12ddfee7509d6fe11.tar.gz qemu-e17408283562be359f16a7e12ddfee7509d6fe11.tar.xz qemu-e17408283562be359f16a7e12ddfee7509d6fe11.zip | |
block: Prevent detection of /dev/fdset/ as floppy
Signed-off-by: Corey Bryant <coreyb@linux.vnet.ibm.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/raw-posix.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/block/raw-posix.c b/block/raw-posix.c index 0dce089be5..f606211760 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -1052,8 +1052,10 @@ static int floppy_probe_device(const char *filename) struct floppy_struct fdparam; struct stat st; - if (strstart(filename, "/dev/fd", NULL)) + if (strstart(filename, "/dev/fd", NULL) && + !strstart(filename, "/dev/fdset/", NULL)) { prio = 50; + } fd = open(filename, O_RDONLY | O_NONBLOCK); if (fd < 0) { |