From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NVCK3-0003G9-MA for qemu-devel@nongnu.org; Wed, 13 Jan 2010 18:08:19 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NVCJz-0003Fv-09 for qemu-devel@nongnu.org; Wed, 13 Jan 2010 18:08:19 -0500 Received: from [199.232.76.173] (port=39153 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NVCJy-0003Fs-RN for qemu-devel@nongnu.org; Wed, 13 Jan 2010 18:08:14 -0500 Received: from e35.co.us.ibm.com ([32.97.110.153]:36108) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NVCJy-0001S7-8o for qemu-devel@nongnu.org; Wed, 13 Jan 2010 18:08:14 -0500 Received: from d03relay05.boulder.ibm.com (d03relay05.boulder.ibm.com [9.17.195.107]) by e35.co.us.ibm.com (8.14.3/8.13.1) with ESMTP id o0DMsOSr024593 for ; Wed, 13 Jan 2010 15:54:24 -0700 Received: from d03av06.boulder.ibm.com (d03av06.boulder.ibm.com [9.17.195.245]) by d03relay05.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o0DN7kJD182388 for ; Wed, 13 Jan 2010 16:07:48 -0700 Received: from d03av06.boulder.ibm.com (loopback [127.0.0.1]) by d03av06.boulder.ibm.com (8.14.3/8.13.1/NCO v10.0 AVout) with ESMTP id o0DN9nUp023704 for ; Wed, 13 Jan 2010 16:09:50 -0700 Message-ID: <4B4E5241.3070006@linux.vnet.ibm.com> Date: Wed, 13 Jan 2010 17:07:45 -0600 From: Anthony Liguori MIME-Version: 1.0 Subject: Re: [Qemu-devel] [PATCH v2] raw-posix: Detect legacy floppy via ioctl References: <1263310152-4443-2-git-send-email-crobinso@redhat.com> In-Reply-To: <1263310152-4443-2-git-send-email-crobinso@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Cole Robinson Cc: qemu-devel@nongnu.org, hch@lst.de On 01/12/2010 09:29 AM, Cole Robinson wrote: > Current legacy floppy detection is hardcoded based on source file > name. Make this smarter by attempting a floppy specific ioctl. > > v2: Give ioctl check higher priority than filename check, > s/IDE/legacy/ > > Signed-off-by: Cole Robinson > --- > block/raw-posix.c | 20 ++++++++++++++++++-- > 1 files changed, 18 insertions(+), 2 deletions(-) > > diff --git a/block/raw-posix.c b/block/raw-posix.c > index b7254d8..d67280e 100644 > --- a/block/raw-posix.c > +++ b/block/raw-posix.c > @@ -1055,9 +1055,25 @@ static int floppy_open(BlockDriverState *bs, const char *filename, int flags) > > static int floppy_probe_device(const char *filename) > { > + int fd, ret, prio; > + struct floppy_struct fdparam; > + > if (strstart(filename, "/dev/fd", NULL)) > - return 100; > - return 0; > + prio = 50; > + > + fd = open(filename, O_RDONLY | O_NONBLOCK); > + if (fd< 0) { > + goto out; > + } > + > + /* Attempt to detect via a floppy specific ioctl */ > + ret = ioctl(fd, FDGETPRM,&fdparam); > + if (!(ret< 0&& errno == EINVAL)) > These two patches break boot from an image file. My suspicious is that it's failing because the errno is ENOSYS. You probably want to do the opposite and check for a positive return result instead of checking for the absence of a positive result. Regards, Anthony Liguori