All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: anthony@codemonkey.ws
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 03/10] block: Prevent detection of /dev/fdset/ as floppy
Date: Wed, 15 Aug 2012 15:56:36 +0200	[thread overview]
Message-ID: <1345039003-19186-4-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1345039003-19186-1-git-send-email-kwolf@redhat.com>

From: Corey Bryant <coreyb@linux.vnet.ibm.com>

Signed-off-by: Corey Bryant <coreyb@linux.vnet.ibm.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 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

  parent reply	other threads:[~2012-08-15 13:56 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-15 13:56 [Qemu-devel] [PULL 00/10] Block patches Kevin Wolf
2012-08-15 13:56 ` [Qemu-devel] [PATCH 01/10] qemu-char: Add MSG_CMSG_CLOEXEC flag to recvmsg Kevin Wolf
2012-08-15 13:56 ` [Qemu-devel] [PATCH 02/10] qapi: Introduce add-fd, remove-fd, query-fdsets Kevin Wolf
2012-08-15 13:56 ` Kevin Wolf [this message]
2012-08-15 13:56 ` [Qemu-devel] [PATCH 04/10] block: Convert open calls to qemu_open Kevin Wolf
2012-08-15 13:56 ` [Qemu-devel] [PATCH 05/10] block: Convert close calls to qemu_close Kevin Wolf
2012-08-15 13:56 ` [Qemu-devel] [PATCH 06/10] block: Enable qemu_open/close to work with fd sets Kevin Wolf
2012-08-15 23:37   ` Peter Maydell
2012-08-15 13:56 ` [Qemu-devel] [PATCH 07/10] monitor: Clean up fd sets on monitor disconnect Kevin Wolf
2012-08-15 13:56 ` [Qemu-devel] [PATCH 08/10] iscsi: Fix NULL dereferences / races between task completion and abort Kevin Wolf
2012-08-18 19:21   ` Paolo Bonzini
2012-08-15 13:56 ` [Qemu-devel] [PATCH 09/10] block: Flush parent to OS with cache=unsafe Kevin Wolf
2012-08-15 13:56 ` [Qemu-devel] [PATCH 10/10] qemu-iotests: Fix 030 after switch to GenericError Kevin Wolf
2012-08-15 19:49 ` [Qemu-devel] [PULL 00/10] Block patches Anthony Liguori

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1345039003-19186-4-git-send-email-kwolf@redhat.com \
    --to=kwolf@redhat.com \
    --cc=anthony@codemonkey.ws \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.