[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/11] vvfat: need to use first_sectors_number to di
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 08/11] vvfat: need to use first_sectors_number to distinguish fdd/hdd |
Date: |
Mon, 7 Nov 2011 17:55:15 +0100 |
From: Paolo Bonzini <address@hidden>
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 <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
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
- [Qemu-devel] [PATCH 00/11] Block patches for 1.0, Kevin Wolf, 2011/11/07
- [Qemu-devel] [PATCH 03/11] dma: Avoid reentrancy in DMA transfer handlers, Kevin Wolf, 2011/11/07
- [Qemu-devel] [PATCH 01/11] qemu-io: Handle create_iovec errors, Kevin Wolf, 2011/11/07
- [Qemu-devel] [PATCH 05/11] block/cloop: Use g_free instead of free, Kevin Wolf, 2011/11/07
- [Qemu-devel] [PATCH 04/11] block/cloop: Fix coding style, Kevin Wolf, 2011/11/07
- [Qemu-devel] [PATCH 08/11] vvfat: need to use first_sectors_number to distinguish fdd/hdd,
Kevin Wolf <=
- [Qemu-devel] [PATCH 06/11] vvfat: fix out of bounds array_get usage, Kevin Wolf, 2011/11/07
- [Qemu-devel] [PATCH 09/11] vvfat: unify and correct computation of sector count, Kevin Wolf, 2011/11/07
- [Qemu-devel] [PATCH 02/11] qemu-io: Fix multiwrite_f error handling, Kevin Wolf, 2011/11/07
- [Qemu-devel] [PATCH 07/11] vvfat: do not fail if the disk has spare sectors, Kevin Wolf, 2011/11/07
- [Qemu-devel] [PATCH 10/11] vvfat: do not hardcode sector counts in error message, Kevin Wolf, 2011/11/07
- [Qemu-devel] [PATCH 11/11] vvfat: reorganize computation of disk geometry, Kevin Wolf, 2011/11/07
- [Qemu-devel] [PULL 00/11] Block patches for 1.0, Kevin Wolf, 2011/11/07