[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/11] vvfat: do not fail if the disk has spare sect
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 07/11] vvfat: do not fail if the disk has spare sectors |
Date: |
Mon, 7 Nov 2011 17:55:14 +0100 |
From: Paolo Bonzini <address@hidden>
If the number of "faked sectors" + the number of sectors that are
part of a cluster does not sum up to the total number of sectors,
qemu-img convert fails. Read these spare sectors as all zeros.
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 75d0dc0..9f851b0 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -1245,7 +1245,7 @@ static int vvfat_read(BlockDriverState *bs, int64_t
sector_num,
int i;
for(i=0;i<nb_sectors;i++,sector_num++) {
- if (sector_num >= s->sector_count)
+ if (sector_num >= bs->total_sectors)
return -1;
if (s->qcow) {
int n;
@@ -1271,7 +1271,7 @@ DLOG(fprintf(stderr, "sector %d not allocated\n",
(int)sector_num));
uint32_t sector=sector_num-s->faked_sectors,
sector_offset_in_cluster=(sector%s->sectors_per_cluster),
cluster_num=sector/s->sectors_per_cluster;
- if(read_cluster(s, cluster_num) != 0) {
+ if(cluster_num > s->cluster_count || read_cluster(s, cluster_num)
!= 0) {
/* LATER TODO: strict: return -1; */
memset(buf+i*0x200,0,0x200);
continue;
--
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, 2011/11/07
- [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 <=
- [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