From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:41358) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RNSQq-00021P-Dp for qemu-devel@nongnu.org; Mon, 07 Nov 2011 11:52:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RNSQp-0004pj-4S for qemu-devel@nongnu.org; Mon, 07 Nov 2011 11:52:24 -0500 Received: from mx1.redhat.com ([209.132.183.28]:13136) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RNSQo-0004pd-TQ for qemu-devel@nongnu.org; Mon, 07 Nov 2011 11:52:23 -0500 From: Kevin Wolf Date: Mon, 7 Nov 2011 17:55:15 +0100 Message-Id: <1320684918-6483-9-git-send-email-kwolf@redhat.com> In-Reply-To: <1320684918-6483-1-git-send-email-kwolf@redhat.com> References: <1320684918-6483-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 08/11] vvfat: need to use first_sectors_number to distinguish fdd/hdd 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: Paolo Bonzini This is consistent with what "real" floppies have, so file(1) now actually recognizes the VVFAT image as a 1.44 MB floppy. Signed-off-by: Paolo Bonzini Signed-off-by: Kevin Wolf --- block/vvfat.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/block/vvfat.c b/block/vvfat.c index 9f851b0..1f7cc48 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -954,7 +954,7 @@ static int init_directories(BDRVVVFATState* s, bootsector->number_of_fats=0x2; /* number of FATs */ bootsector->root_entries=cpu_to_le16(s->sectors_of_root_directory*0x10); bootsector->total_sectors16=s->sector_count>0xffff?0:cpu_to_le16(s->sector_count); - bootsector->media_type=(s->fat_type!=12?0xf8:s->sector_count==5760?0xf9:0xf8); /* media descriptor */ + bootsector->media_type=(s->first_sectors_number>1?0xf8:0xf0); /* media descriptor (f8=hd, f0=3.5 fd)*/ s->fat.pointer[0] = bootsector->media_type; bootsector->sectors_per_fat=cpu_to_le16(s->sectors_per_fat); bootsector->sectors_per_track=cpu_to_le16(s->bs->secs); @@ -963,7 +963,7 @@ static int init_directories(BDRVVVFATState* s, bootsector->total_sectors=cpu_to_le32(s->sector_count>0xffff?s->sector_count:0); /* LATER TODO: if FAT32, this is wrong */ - bootsector->u.fat16.drive_number=s->fat_type==12?0:0x80; /* assume this is hda (TODO) */ + bootsector->u.fat16.drive_number=s->first_sectors_number==1?0:0x80; /* fda=0, hda=0x80 */ bootsector->u.fat16.current_head=0; bootsector->u.fat16.signature=0x29; bootsector->u.fat16.id=cpu_to_le32(0xfabe1afd); -- 1.7.6.4