[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [STABLE][PATCH 05/14] block/vpc: Fix conversion from size t
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [STABLE][PATCH 05/14] block/vpc: Fix conversion from size to disk geometry |
Date: |
Wed, 14 Jul 2010 13:24:04 +0200 |
From: Stefan Weil <address@hidden>
The VHD algorithm calculates a disk geometry
which is usually smaller than the requested size.
QEMU tried to round up but failed for certain sizes:
qemu-img create -f vpc disk.vpc 9437184
would create an image with 9435136 bytes
(which is too small for qemu-img convert).
Instead of hacking the geometry algorithm, the patch
increases the number of sectors until we get enough
sectors.
Cc: Kevin Wolf <address@hidden>
Signed-off-by: Stefan Weil <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
(cherry picked from commit dede4188cc817a039154ed2ecd7f3285f6b94056)
---
block/vpc.c | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/block/vpc.c b/block/vpc.c
index 950ad58..afe6f1a 100644
--- a/block/vpc.c
+++ b/block/vpc.c
@@ -470,9 +470,7 @@ static int calculate_geometry(int64_t total_sectors,
uint16_t* cyls,
}
}
- // Note: Rounding up deviates from the Virtual PC behaviour
- // However, we need this to avoid truncating images in qemu-img convert
- *cyls = (cyls_times_heads + *heads - 1) / *heads;
+ *cyls = cyls_times_heads / *heads;
return 0;
}
@@ -484,9 +482,9 @@ static int vpc_create(const char *filename,
QEMUOptionParameter *options)
struct vhd_dyndisk_header* dyndisk_header =
(struct vhd_dyndisk_header*) buf;
int fd, i;
- uint16_t cyls;
- uint8_t heads;
- uint8_t secs_per_cyl;
+ uint16_t cyls = 0;
+ uint8_t heads = 0;
+ uint8_t secs_per_cyl = 0;
size_t block_size, num_bat_entries;
int64_t total_sectors = 0;
@@ -503,9 +501,14 @@ static int vpc_create(const char *filename,
QEMUOptionParameter *options)
if (fd < 0)
return -EIO;
- // Calculate matching total_size and geometry
- if (calculate_geometry(total_sectors, &cyls, &heads, &secs_per_cyl))
- return -EFBIG;
+ /* Calculate matching total_size and geometry. Increase the number of
+ sectors requested until we get enough (or fail). */
+ for (i = 0; total_sectors > (int64_t)cyls * heads * secs_per_cyl; i++) {
+ if (calculate_geometry(total_sectors + i,
+ &cyls, &heads, &secs_per_cyl)) {
+ return -EFBIG;
+ }
+ }
total_sectors = (int64_t) cyls * heads * secs_per_cyl;
// Prepare the Hard Disk Footer
--
1.7.1.1
- [Qemu-devel] [STABLE][PULL 00/14] Block patches for 0.12.5, Kevin Wolf, 2010/07/14
- [Qemu-devel] [STABLE][PATCH 01/14] vmdk: fix double free, Kevin Wolf, 2010/07/14
- [Qemu-devel] [STABLE][PATCH 04/14] qcow2: Remove abort on free_clusters failure, Kevin Wolf, 2010/07/14
- [Qemu-devel] [STABLE][PATCH 03/14] vmdk: Fix COW, Kevin Wolf, 2010/07/14
- [Qemu-devel] [STABLE][PATCH 02/14] qcow2: Fix creation of large images, Kevin Wolf, 2010/07/14
- [Qemu-devel] [STABLE][PATCH 05/14] block/vpc: Fix conversion from size to disk geometry,
Kevin Wolf <=
- [Qemu-devel] [STABLE][PATCH 06/14] block/vdi: Fix image opening and creation for odd disk sizes, Kevin Wolf, 2010/07/14
- [Qemu-devel] [STABLE][PATCH 07/14] qcow2: Restore L1 entry on l2_allocate failure, Kevin Wolf, 2010/07/14
- [Qemu-devel] [STABLE][PATCH 09/14] qcow: Use bdrv_(p)write_sync for metadata writes, Kevin Wolf, 2010/07/14
- [Qemu-devel] [STABLE][PATCH 08/14] block: Add bdrv_(p)write_sync, Kevin Wolf, 2010/07/14
- [Qemu-devel] [STABLE][PATCH 11/14] vmdk: Use bdrv_(p)write_sync for metadata writes, Kevin Wolf, 2010/07/14
- [Qemu-devel] [STABLE][PATCH 10/14] qcow2: Use bdrv_(p)write_sync for metadata writes, Kevin Wolf, 2010/07/14
- [Qemu-devel] [STABLE][PATCH 13/14] block: Fix early failure in multiwrite, Kevin Wolf, 2010/07/14
- [Qemu-devel] [STABLE][PATCH 14/14] block: Handle multiwrite errors only when all requests have completed, Kevin Wolf, 2010/07/14
- [Qemu-devel] [STABLE][PATCH 12/14] vpc: Use bdrv_(p)write_sync for metadata writes, Kevin Wolf, 2010/07/14
- Re: [Qemu-devel] [STABLE][PULL 00/14] Block patches for 0.12.5, Aurelien Jarno, 2010/07/14