From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:39257) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1e5h-0006H7-Fg for qemu-devel@nongnu.org; Wed, 15 Aug 2012 09:56:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T1e5g-0000PE-HA for qemu-devel@nongnu.org; Wed, 15 Aug 2012 09:56:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:27588) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1e5g-0000P9-98 for qemu-devel@nongnu.org; Wed, 15 Aug 2012 09:56:56 -0400 From: Kevin Wolf Date: Wed, 15 Aug 2012 15:56:36 +0200 Message-Id: <1345039003-19186-4-git-send-email-kwolf@redhat.com> In-Reply-To: <1345039003-19186-1-git-send-email-kwolf@redhat.com> References: <1345039003-19186-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 03/10] block: Prevent detection of /dev/fdset/ as floppy List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Corey Bryant Signed-off-by: Corey Bryant Signed-off-by: Kevin Wolf --- 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