From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35448) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y4ssO-0006Ij-Fj for qemu-devel@nongnu.org; Sat, 27 Dec 2014 10:01:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y4ssJ-0000Oo-2b for qemu-devel@nongnu.org; Sat, 27 Dec 2014 10:01:56 -0500 Received: from mail.lekensteyn.nl ([2a02:2308::360:1:25]:44805) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y4ssI-0000Nx-Si for qemu-devel@nongnu.org; Sat, 27 Dec 2014 10:01:51 -0500 From: Peter Wu Date: Sat, 27 Dec 2014 16:01:41 +0100 Message-Id: <1419692504-29373-8-git-send-email-peter@lekensteyn.nl> In-Reply-To: <1419692504-29373-1-git-send-email-peter@lekensteyn.nl> References: <1419692504-29373-1-git-send-email-peter@lekensteyn.nl> Subject: [Qemu-devel] [PATCH 07/10] 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: Kevin Wolf , Stefan Hajnoczi 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 BLXX ("mish") header. 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 --- block/dmg.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/block/dmg.c b/block/dmg.c index c03ea01..984997f 100644 --- a/block/dmg.c +++ b/block/dmg.c @@ -430,6 +430,14 @@ static int dmg_open(BlockDriverState *bs, QDict *options, int flags, if (ret < 0) { 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_offset != 0 && rsrc_fork_length != 0) { ret = dmg_read_resource_fork(bs, &ds, rsrc_fork_offset, rsrc_fork_length); -- 2.2.1