From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49904) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YC8xz-0001df-0h for qemu-devel@nongnu.org; Fri, 16 Jan 2015 10:37:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YC8xt-0000hL-FG for qemu-devel@nongnu.org; Fri, 16 Jan 2015 10:37:42 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50767) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YC8xt-0000h8-98 for qemu-devel@nongnu.org; Fri, 16 Jan 2015 10:37:37 -0500 From: Stefan Hajnoczi Date: Fri, 16 Jan 2015 15:37:05 +0000 Message-Id: <1421422633-25536-9-git-send-email-stefanha@redhat.com> In-Reply-To: <1421422633-25536-1-git-send-email-stefanha@redhat.com> References: <1421422633-25536-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 08/16] block/dmg: set virtual size to a non-zero value List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Peter Wu , Stefan Hajnoczi From: Peter Wu Right now the virtual size is always reported as zero which makes it impossible to convert between formats. After this patch, the number of sectors will be read from the trailer ("koly" block). To verify the behavior, the output of `dmg2img foo.dmg foo.img` was compared against `qemu-img convert -f dmg -O raw foo.dmg foo.raw`. The tests showed that the file contents are exactly the same, except that QEMU creates a slightly larger file (it matches the total sectors count). Signed-off-by: Peter Wu Reviewed-by: John Snow Message-id: 1420566495-13284-8-git-send-email-peter@lekensteyn.nl Signed-off-by: Stefan Hajnoczi --- block/dmg.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/block/dmg.c b/block/dmg.c index d4a7520..3f8f1cc 100644 --- a/block/dmg.c +++ b/block/dmg.c @@ -451,6 +451,14 @@ static int dmg_open(BlockDriverState *bs, QDict *options, int flags, ret = -EINVAL; goto fail; } + ret = read_uint64(bs, offset + 0x1ec, (uint64_t *)&bs->total_sectors); + if (ret < 0) { + goto fail; + } + if (bs->total_sectors < 0) { + ret = -EINVAL; + goto fail; + } if (rsrc_fork_length != 0) { ret = dmg_read_resource_fork(bs, &ds, rsrc_fork_offset, rsrc_fork_length); -- 2.1.0