[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 02/29] vvfat: Fix partition table
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v3 02/29] vvfat: Fix partition table |
Date: |
Tue, 10 Jul 2012 11:12:28 +0200 |
Unless parameter ":floppy:" is given, vvfat creates a virtual image
with DOS MBR defining a single partition which holds the FAT file
system. The size of the virtual image depends on the width of the
FAT: 32 MiB (CHS 64, 16, 63) for 12 bit FAT, 504 MiB (CHS 1024, 16,
63) for 16 and 32 bit FAT, leaving (64*16-1)*63 = 64449 and
(1024*16-1)*64 = 1032129 sectors for the partition.
However, it screws up the end of the partition in the MBR:
FAT width param. start CHS end CHS start LBA size
:32: 0,1,1 1023,14,63 63 1032065
:16: 0,1,1 1023,14,55 63 1032057
:12: 0,1,1 63,14,55 63 64377
The actual FAT file system nevertheless assumes the partition has
1032129 or 64449 sectors. Oops.
Signed-off-by: Markus Armbruster <address@hidden>
---
block/vvfat.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/block/vvfat.c b/block/vvfat.c
index 0fd3367..e2b83a2 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -394,11 +394,12 @@ static void init_mbr(BDRVVVFATState* s)
/* LBA is used when partition is outside the CHS geometry */
lba = sector2CHS(s->bs, &partition->start_CHS, s->first_sectors_number-1);
- lba|= sector2CHS(s->bs, &partition->end_CHS, s->sector_count);
+ lba |= sector2CHS(s->bs, &partition->end_CHS, s->bs->total_sectors - 1);
/*LBA partitions are identified only by start/length_sector_long not by
CHS*/
- partition->start_sector_long =cpu_to_le32(s->first_sectors_number-1);
- partition->length_sector_long=cpu_to_le32(s->sector_count -
s->first_sectors_number+1);
+ partition->start_sector_long = cpu_to_le32(s->first_sectors_number - 1);
+ partition->length_sector_long = cpu_to_le32(s->bs->total_sectors
+ - s->first_sectors_number + 1);
/* FAT12/FAT16/FAT32 */
/* DOS uses different types when partition is LBA,
--
1.7.6.5
- [Qemu-devel] [PATCH v3 00/29] Disk geometry cleanup, Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 04/29] qtest: Add hard disk geometry test, Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 09/29] hd-geometry: Clean up gratuitous goto in hd_geometry_guess(), Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 06/29] hd-geometry: Add tracepoints, Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 02/29] vvfat: Fix partition table,
Markus Armbruster <=
- [Qemu-devel] [PATCH v3 08/29] hd-geometry: Factor out guess_chs_for_size(), Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 01/29] fdc: Move floppy geometry guessing back from block.c, Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 11/29] hd-geometry: Cut out block layer translation middleman, Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 10/29] hd-geometry: Clean up confusing use of prior translation hint, Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 03/29] vvfat: Do not clobber the user's geometry, Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 07/29] hd-geometry: Unnest conditional in hd_geometry_guess(), Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 14/29] qdev: Introduce block geometry properties, Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 15/29] hd-geometry: Switch to uint32_t to match BlockConf, Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 12/29] ide pc: Cut out the block layer geometry middleman, Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 21/29] qdev: New property type chs-translation, Markus Armbruster, 2012/07/10