qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [PATCH v10 3/7] block: Prevent detection of /dev/fdset/ as


From: Corey Bryant
Subject: [Qemu-devel] [PATCH v10 3/7] block: Prevent detection of /dev/fdset/ as floppy
Date: Mon, 13 Aug 2012 10:08:45 -0400

Signed-off-by: Corey Bryant <address@hidden>
---
v8
 -This patch is new in v8. It was reported on a prior fd passing
  approach and I realized it's needed in this series.
  (address@hidden)

v9-v10
 -No changes

 block/raw-posix.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/block/raw-posix.c b/block/raw-posix.c
index 0dce089..f606211 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) {
-- 
1.7.10.4




reply via email to

[Prev in Thread] Current Thread [Next in Thread]