From patchwork Mon May 10 20:12:33 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 52138 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1FACEB7D11 for ; Tue, 11 May 2010 06:14:56 +1000 (EST) Received: from localhost ([127.0.0.1]:33984 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OBZNM-0005RD-RE for incoming@patchwork.ozlabs.org; Mon, 10 May 2010 16:14:52 -0400 Received: from [140.186.70.92] (port=48302 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OBZLa-0004vt-9c for qemu-devel@nongnu.org; Mon, 10 May 2010 16:13:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OBZLW-0007eW-DY for qemu-devel@nongnu.org; Mon, 10 May 2010 16:13:01 -0400 Received: from moutng.kundenserver.de ([212.227.17.9]:57597) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OBZLW-0007e7-1P for qemu-devel@nongnu.org; Mon, 10 May 2010 16:12:58 -0400 Received: from flocke.weilnetz.de (p54ADED78.dip.t-dialin.net [84.173.237.120]) by mrelayeu.kundenserver.de (node=mrbap0) with ESMTP (Nemesis) id 0Lbh4l-1NSII21tO7-00kzY1; Mon, 10 May 2010 22:12:45 +0200 Received: from stefan by flocke.weilnetz.de with local (Exim 4.71) (envelope-from ) id 1OBZLD-0003Lm-8d; Mon, 10 May 2010 22:12:39 +0200 From: Stefan Weil To: qemu-devel@nongnu.org Date: Mon, 10 May 2010 22:12:33 +0200 Message-Id: <1273522353-12851-1-git-send-email-weil@mail.berlios.de> X-Mailer: git-send-email 1.7.1 In-Reply-To: <4BE7BA2B.103@redhat.com> References: <4BE7BA2B.103@redhat.com> MIME-Version: 1.0 X-Provags-ID: V01U2FsdGVkX19ZXWds2yUdbfBvfJ0uUor3V/8KpF3yL9u4a4C fR1NJofdaCZ9DRv6qsPECwO8Pxn2FZQy8lQ0A8QdtAdagWw85h w3RnPSLIZLYOlN2J6z5yk2h8I+opD3tcimZF4rEmkG6MwDgYgq ZhQ== X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Kevin Wolf , =?UTF-8?q?Fran=C3=A7ois=20Revol?= Subject: [Qemu-devel] [PATCH] vdi: Fix image opening and creation for odd disk sizes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The fix is based on a patch from Kevin Wolf. Here his comment: "The number of blocks needs to be rounded up to cover all of the virtual hard disk. Without this fix, we can't even open our own images if their size is not a multiple of the block size." While Kevin's patch addressed vdi_create, my modification also fixes vdi_open which now accepts images with odd disk sizes as well as images created with old versions of qemu-img. Cc: Kevin Wolf Cc: François Revol Signed-off-by: Stefan Weil --- block/vdi.c | 29 +++++++++++++++++++++-------- 1 files changed, 21 insertions(+), 8 deletions(-) diff --git a/block/vdi.c b/block/vdi.c index 1ce18d5..362c898 100644 --- a/block/vdi.c +++ b/block/vdi.c @@ -405,19 +405,12 @@ static int vdi_open(BlockDriverState *bs, int flags) /* We only support data blocks which start on a sector boundary. */ logout("unsupported data offset 0x%x B\n", header.offset_data); goto fail; - } else if (header.disk_size % SECTOR_SIZE != 0) { - logout("unsupported disk size %" PRIu64 " B\n", header.disk_size); - goto fail; } else if (header.sector_size != SECTOR_SIZE) { logout("unsupported sector size %u B\n", header.sector_size); goto fail; } else if (header.block_size != 1 * MiB) { logout("unsupported block size %u B\n", header.block_size); goto fail; - } else if ((header.disk_size + header.block_size - 1) / header.block_size != - (uint64_t)header.blocks_in_image) { - logout("unexpected block number %u B\n", header.blocks_in_image); - goto fail; } else if (!uuid_is_null(header.uuid_link)) { logout("link uuid != 0, unsupported\n"); goto fail; @@ -426,6 +419,23 @@ static int vdi_open(BlockDriverState *bs, int flags) goto fail; } + if (header.disk_size % SECTOR_SIZE != 0) { + /* 'VBoxManage convertfromraw' can create images with odd disk sizes. + We accept them but round the disk size to the next multiple of + SECTOR_SIZE. */ + logout("odd disk size %" PRIu64 " B, round up\n", header.disk_size); + header.disk_size += SECTOR_SIZE - 1; + header.disk_size &= ~(SECTOR_SIZE - 1); + } + + if (header.disk_size > + (uint64_t)header.blocks_in_image * header.block_size) { + /* Old versions of qemu-img could create images with too large + disk sizes. We accept them but truncate the disk size. */ + logout("large disk size %" PRIu64 " B, truncated\n", header.disk_size); + header.disk_size = (uint64_t)header.blocks_in_image * header.block_size; + } + bs->total_sectors = header.disk_size / SECTOR_SIZE; s->block_size = header.block_size; @@ -829,7 +839,10 @@ static int vdi_create(const char *filename, QEMUOptionParameter *options) return -errno; } - blocks = bytes / block_size; + /* We need enough blocks to store the given disk size, + so always round up. */ + blocks = (bytes + block_size - 1) / block_size; + bmap_size = blocks * sizeof(uint32_t); bmap_size = ((bmap_size + SECTOR_SIZE - 1) & ~(SECTOR_SIZE -1));