[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/10] block: Prevent detection of /dev/fdset/ as fl
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 03/10] block: Prevent detection of /dev/fdset/ as floppy |
Date: |
Wed, 15 Aug 2012 15:56:36 +0200 |
From: Corey Bryant <address@hidden>
Signed-off-by: Corey Bryant <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
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 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.6.5
- [Qemu-devel] [PULL 00/10] Block patches, Kevin Wolf, 2012/08/15
- [Qemu-devel] [PATCH 01/10] qemu-char: Add MSG_CMSG_CLOEXEC flag to recvmsg, Kevin Wolf, 2012/08/15
- [Qemu-devel] [PATCH 03/10] block: Prevent detection of /dev/fdset/ as floppy,
Kevin Wolf <=
- [Qemu-devel] [PATCH 02/10] qapi: Introduce add-fd, remove-fd, query-fdsets, Kevin Wolf, 2012/08/15
- [Qemu-devel] [PATCH 04/10] block: Convert open calls to qemu_open, Kevin Wolf, 2012/08/15
- [Qemu-devel] [PATCH 05/10] block: Convert close calls to qemu_close, Kevin Wolf, 2012/08/15
- [Qemu-devel] [PATCH 06/10] block: Enable qemu_open/close to work with fd sets, Kevin Wolf, 2012/08/15
- [Qemu-devel] [PATCH 07/10] monitor: Clean up fd sets on monitor disconnect, Kevin Wolf, 2012/08/15
- [Qemu-devel] [PATCH 09/10] block: Flush parent to OS with cache=unsafe, Kevin Wolf, 2012/08/15
- [Qemu-devel] [PATCH 10/10] qemu-iotests: Fix 030 after switch to GenericError, Kevin Wolf, 2012/08/15
- [Qemu-devel] [PATCH 08/10] iscsi: Fix NULL dereferences / races between task completion and abort, Kevin Wolf, 2012/08/15