projects
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ba1c048
)
block: Prevent detection of /dev/fdset/ as floppy
author
Corey Bryant
<coreyb@linux.vnet.ibm.com>
Tue, 14 Aug 2012 20:43:44 +0000
(16:43 -0400)
committer
Kevin Wolf
<kwolf@redhat.com>
Wed, 15 Aug 2012 08:48:57 +0000
(10:48 +0200)
Signed-off-by: Corey Bryant <coreyb@linux.vnet.ibm.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
block/raw-posix.c
patch
|
blob
|
history
diff --git
a/block/raw-posix.c
b/block/raw-posix.c
index 0dce089be537d8ed3e8d7f30f57dc7412554add6..f60621176064f4f9a07d159781b20f0471c2343d 100644
(file)
--- 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) {