From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:38232) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T0vL6-0002qA-Bn for qemu-devel@nongnu.org; Mon, 13 Aug 2012 10:09:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T0vL2-0003Ik-8V for qemu-devel@nongnu.org; Mon, 13 Aug 2012 10:09:52 -0400 Received: from e3.ny.us.ibm.com ([32.97.182.143]:32816) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T0vL2-0003Ig-4o for qemu-devel@nongnu.org; Mon, 13 Aug 2012 10:09:48 -0400 Received: from /spool/local by e3.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 13 Aug 2012 10:09:47 -0400 Received: from d01relay07.pok.ibm.com (d01relay07.pok.ibm.com [9.56.227.147]) by d01dlp03.pok.ibm.com (Postfix) with ESMTP id 40725C901C9 for ; Mon, 13 Aug 2012 10:09:04 -0400 (EDT) Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay07.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q7DE91IT24182952 for ; Mon, 13 Aug 2012 10:09:01 -0400 Received: from d01av01.pok.ibm.com (loopback [127.0.0.1]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q7DE90NA029388 for ; Mon, 13 Aug 2012 10:09:01 -0400 From: Corey Bryant Date: Mon, 13 Aug 2012 10:08:45 -0400 Message-Id: <1344866929-30456-4-git-send-email-coreyb@linux.vnet.ibm.com> In-Reply-To: <1344866929-30456-1-git-send-email-coreyb@linux.vnet.ibm.com> References: <1344866929-30456-1-git-send-email-coreyb@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v10 3/7] block: Prevent detection of /dev/fdset/ as floppy List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, aliguori@us.ibm.com, stefanha@linux.vnet.ibm.com, libvir-list@redhat.com, Corey Bryant , lcapitulino@redhat.com, pbonzini@redhat.com, eblake@redhat.com Signed-off-by: Corey Bryant --- 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. (kwolf@redhat.com) 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