From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Lr03c-0005R9-4N
	for qemu-devel@nongnu.org; Mon, 06 Apr 2009 21:24:56 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Lr03b-0005QX-Jw
	for qemu-devel@nongnu.org; Mon, 06 Apr 2009 21:24:55 -0400
Received: from [199.232.76.173] (port=45667 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Lr03b-0005QN-B5
	for qemu-devel@nongnu.org; Mon, 06 Apr 2009 21:24:55 -0400
Received: from savannah.gnu.org ([199.232.41.3]:54645 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <anthony@codemonkey.ws>)
	id 1Lr03a-0005BB-W6
	for qemu-devel@nongnu.org; Mon, 06 Apr 2009 21:24:55 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.69)
	(envelope-from <anthony@codemonkey.ws>) id 1Lr03a-0003NO-3z
	for qemu-devel@nongnu.org; Tue, 07 Apr 2009 01:24:54 +0000
Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <aliguori@savannah.gnu.org>) id 1Lr03Z-0003NI-KO
	for qemu-devel@nongnu.org; Tue, 07 Apr 2009 01:24:53 +0000
MIME-Version: 1.0
Errors-To: aliguori
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Anthony Liguori <anthony@codemonkey.ws>
Message-Id: <E1Lr03Z-0003NI-KO@cvs.savannah.gnu.org>
Date: Tue, 07 Apr 2009 01:24:53 +0000
Subject: [Qemu-devel] [7010] Fix find_device_type() to correctly identify
 floppy disk devices; ( Luca Tettamanti)
Reply-To: qemu-devel@nongnu.org
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: qemu-devel@nongnu.org

Revision: 7010
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=7010
Author:   aliguori
Date:     2009-04-07 01:24:53 +0000 (Tue, 07 Apr 2009)
Log Message:
-----------
Fix find_device_type() to correctly identify floppy disk devices; (Luca Tettamanti)
they are reported as DRIVE_REMOVABLE by win32.

Signed-off-by: Luca Tettamanti <kronos.it@gmail.com>

Modified Paths:
--------------
    trunk/block-raw-win32.c

Modified: trunk/block-raw-win32.c
===================================================================
--- trunk/block-raw-win32.c	2009-04-06 12:34:07 UTC (rev 7009)
+++ trunk/block-raw-win32.c	2009-04-07 01:24:53 UTC (rev 7010)
@@ -280,10 +280,15 @@
             return FTYPE_HARDDISK;
         snprintf(s->drive_path, sizeof(s->drive_path), "%c:\\", p[0]);
         type = GetDriveType(s->drive_path);
-        if (type == DRIVE_CDROM)
+        switch (type) {
+        case DRIVE_REMOVABLE:
+        case DRIVE_FIXED:
+            return FTYPE_HARDDISK;
+        case DRIVE_CDROM:
             return FTYPE_CD;
-        else
+        default:
             return FTYPE_FILE;
+        }
     } else {
         return FTYPE_FILE;
     }