Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LrZ5T-0000de-S4 for qemu-devel@nongnu.org; Wed, 08 Apr 2009 10:49:11 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LrZ5P-0000bR-Tf for qemu-devel@nongnu.org; Wed, 08 Apr 2009 10:49:11 -0400 Received: from [199.232.76.173] (port=43348 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LrZ5P-0000bG-J0 for qemu-devel@nongnu.org; Wed, 08 Apr 2009 10:49:07 -0400 Received: from mx2.redhat.com ([66.187.237.31]:55191) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LrZ5O-0000lb-Au for qemu-devel@nongnu.org; Wed, 08 Apr 2009 10:49:07 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n38En3Ek006044 for ; Wed, 8 Apr 2009 10:49:03 -0400 From: Kevin Wolf Date: Wed, 8 Apr 2009 16:49:05 +0200 Message-Id: <1239202145-18271-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH] block-vpc: Don't silently create smaller image than requested Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf The algorithm from the VHD specification for CHS calculation silently limits images to 127 GB which may confuse a user who requested a larger image. Better output an error message and abort. Signed-off-by: Kevin Wolf --- block-vpc.c | 9 ++++++--- qemu-img.c | 4 ++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/block-vpc.c b/block-vpc.c index 7ae5202..d915d20 100644 --- a/block-vpc.c +++ b/block-vpc.c @@ -433,14 +433,16 @@ static int vpc_write(BlockDriverState *bs, int64_t sector_num, * * Note that the geometry doesn't always exactly match total_sectors but * may round it down. + * + * Returns 0 on success, -EFBIG if the size is larger than 127 GB */ -static void calculate_geometry(int64_t total_sectors, uint16_t* cyls, +static int calculate_geometry(int64_t total_sectors, uint16_t* cyls, uint8_t* heads, uint8_t* secs_per_cyl) { uint32_t cyls_times_heads; if (total_sectors > 65535 * 16 * 255) - total_sectors = 65535 * 16 * 255; + return -EFBIG; if (total_sectors > 65535 * 16 * 63) { *secs_per_cyl = 255; @@ -493,7 +495,8 @@ static int vpc_create(const char *filename, int64_t total_sectors, return -EIO; // Calculate matching total_size and geometry - calculate_geometry(total_sectors, &cyls, &heads, &secs_per_cyl); + if (calculate_geometry(total_sectors, &cyls, &heads, &secs_per_cyl)) + return -EFBIG; total_sectors = (int64_t) cyls * heads * secs_per_cyl; // Prepare the Hard Disk Footer diff --git a/qemu-img.c b/qemu-img.c index 913ad34..ccf4a6f 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -306,6 +306,8 @@ static int img_create(int argc, char **argv) if (ret < 0) { if (ret == -ENOTSUP) { error("Formatting or formatting option not supported for file format '%s'", fmt); + } else if (ret == -EFBIG) { + error("The image size is too large for file format '%s'", fmt); } else { error("Error while formatting"); } @@ -494,6 +496,8 @@ static int img_convert(int argc, char **argv) if (ret < 0) { if (ret == -ENOTSUP) { error("Formatting not supported for file format '%s'", out_fmt); + } else if (ret == -EFBIG) { + error("The image size is too large for file format '%s'", out_fmt); } else { error("Error while formatting '%s'", out_filename); } -- 1.6.0.6