From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NVCt8-0005lp-9B
	for qemu-devel@nongnu.org; Wed, 13 Jan 2010 18:44:34 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NVCt3-0005jR-Ly
	for qemu-devel@nongnu.org; Wed, 13 Jan 2010 18:44:33 -0500
Received: from [199.232.76.173] (port=55181 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NVCt3-0005jM-6E
	for qemu-devel@nongnu.org; Wed, 13 Jan 2010 18:44:29 -0500
Received: from mx1.redhat.com ([209.132.183.28]:21665)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <crobinso@redhat.com>) id 1NVCt2-0005su-Lw
	for qemu-devel@nongnu.org; Wed, 13 Jan 2010 18:44:29 -0500
Message-ID: <4B4E5ACB.5070804@redhat.com>
Date: Wed, 13 Jan 2010 18:44:11 -0500
From: Cole Robinson <crobinso@redhat.com>
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>
	<4B4E5241.3070006@linux.vnet.ibm.com>
In-Reply-To: <4B4E5241.3070006@linux.vnet.ibm.com>
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Anthony Liguori <aliguori@linux.vnet.ibm.com>
Cc: qemu-devel@nongnu.org, hch@lst.de

On 01/13/2010 06:07 PM, Anthony Liguori wrote:
> 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<crobinso@redhat.com>
>> ---
>>   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.
> 

Ugh, sorry about that.

> You probably want to do the opposite and check for a positive return
> result instead of checking for the absence of a positive result.
> 

Sounds good.

Thanks,
Cole