qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: anthony@codemonkey.ws
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 09/43] block: vpc support for ~2 TB disks
Date: Thu, 13 Dec 2012 16:10:16 +0100	[thread overview]
Message-ID: <1355411450-12761-10-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1355411450-12761-1-git-send-email-kwolf@redhat.com>

From: Charles Arnold <carnold@suse.com>

The VHD specification allows for up to a 2 TB disk size. The current
implementation in qemu emulates EIDE and ATA-2 hardware which only allows
for up to 127 GB.  This disk size limitation can be overridden by allowing
up to 255 heads instead of the normal 4 bit limitation of 16.  Doing so
allows disk images to be created of up to nearly 2 TB.  This change does
not violate the VHD format specification nor does it change how smaller
disks (ie, <=127GB) are defined.

[Charles Arnold also writes: "In analyzing a 160 GB VHD fixed disk image
created on Windows 2008 R2, it appears that MS is also ignoring the CHS
values in the footer geometry field in whatever driver they use for
accessing the image.  The CHS values are set at 65535,16,255 which
obviously doesn't represent an image size of 160 GB." -- Stefan]

Signed-off-by: Charles Arnold <carnold@suse.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 block/vpc.c |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/block/vpc.c b/block/vpc.c
index f14c6ae..566e9a3 100644
--- a/block/vpc.c
+++ b/block/vpc.c
@@ -201,7 +201,8 @@ static int vpc_open(BlockDriverState *bs, int flags)
     bs->total_sectors = (int64_t)
         be16_to_cpu(footer->cyls) * footer->heads * footer->secs_per_cyl;
 
-    if (bs->total_sectors >= 65535 * 16 * 255) {
+    /* Allow a maximum disk size of approximately 2 TB */
+    if (bs->total_sectors >= 65535LL * 255 * 255) {
         err = -EFBIG;
         goto fail;
     }
@@ -527,19 +528,27 @@ static coroutine_fn int vpc_co_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
+ * Returns 0 on success, -EFBIG if the size is larger than ~2 TB. Override
+ * the hardware EIDE and ATA-2 limit of 16 heads (max disk size of 127 GB)
+ * and instead allow up to 255 heads.
  */
 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)
+    /* Allow a maximum disk size of approximately 2 TB */
+    if (total_sectors > 65535LL * 255 * 255) {
         return -EFBIG;
+    }
 
     if (total_sectors > 65535 * 16 * 63) {
         *secs_per_cyl = 255;
-        *heads = 16;
+        if (total_sectors > 65535 * 16 * 255) {
+            *heads = 255;
+        } else {
+            *heads = 16;
+        }
         cyls_times_heads = total_sectors / *secs_per_cyl;
     } else {
         *secs_per_cyl = 17;
-- 
1.7.6.5

  parent reply	other threads:[~2012-12-13 15:11 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-12-13 15:10 [Qemu-devel] [PULL 00/43] Block patches Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 01/43] tests: use aio_poll() instead of aio_flush() in test-aio.c Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 02/43] tests: avoid qemu_aio_flush() in test-thread-pool.c Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 03/43] block: Improve bdrv_aio_co_cancel_em Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 04/43] aio: Get rid of qemu_aio_flush() Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 05/43] block: Factor out bdrv_open_flags Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 06/43] block: Avoid second open for format probing Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 07/43] virtio-blk: Remove duplicate property definition Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 08/43] block: vpc initialize the uuid footer field Kevin Wolf
2012-12-13 15:10 ` Kevin Wolf [this message]
2012-12-13 15:10 ` [Qemu-devel] [PATCH 10/43] raw-posix: inline paio_ioctl into hdev_aio_ioctl Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 11/43] Support default block interfaces per QEMUMachine Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 12/43] block: simplify default_drive Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 13/43] block: bdrv_img_create(): add Error ** argument Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 14/43] qemu-img: img_create(): pass Error object to bdrv_img_create() Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 15/43] qemu-img: img_create(): drop unneeded goto and ret variable Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 16/43] qmp: qmp_transaction(): pass Error object to bdrv_img_create() Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 17/43] qmp: qmp_drive_mirror(): " Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 18/43] block: bdrv_img_create(): drop unused error handling code Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 19/43] tests: Add tests for fdsets Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 20/43] qemu-io: Implement write -c for compressed clusters Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 21/43] rbd: Fix race between aio completition and aio cancel Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 22/43] Fix error code checking for SetFilePointer() call Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 23/43] qemu-option: opt_set(): split it up into more functions Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 24/43] qemu-option: qemu_opts_validate(): fix duplicated code Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 25/43] qemu-option: qemu_opt_set_bool(): fix code duplication Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 26/43] introduce qemu_opts_create_nofail function Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 27/43] use qemu_opts_create_nofail Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 28/43] create new function: qemu_opt_set_number Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 29/43] blkdebug: Allow usage without config file Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 30/43] blkdebug: Factor out remove_rule() Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 31/43] blkdebug: Implement suspend/resume of AIO requests Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 32/43] qemu-io: Add AIO debugging commands Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 33/43] qcow2: Move BLKDBG_EVENT out of the lock Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 34/43] qemu-iotests: Test concurrent cluster allocations Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 35/43] atapi: reset cdrom tray statuses on ide_reset Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 36/43] qcow2: Round QCowL2Meta.offset down to cluster boundary Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 37/43] qcow2: Introduce Qcow2COWRegion Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 38/43] qcow2: Allocate l2meta dynamically Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 39/43] qcow2: Drop l2meta.cluster_offset Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 40/43] qcow2: Allocate l2meta only for cluster allocations Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 41/43] qcow2: Enable dirty flag in qcow2_alloc_cluster_link_l2 Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 42/43] qcow2: Execute run_dependent_requests() without lock Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 43/43] qcow2: Factor out handle_dependencies() Kevin Wolf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1355411450-12761-10-git-send-email-kwolf@redhat.com \
    --to=kwolf@redhat.com \
    --cc=anthony@codemonkey.ws \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).