[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 07/12] block/dmg: set virtual size to a non-zero
From: |
Peter Wu |
Subject: |
[Qemu-devel] [PATCH v2 07/12] block/dmg: set virtual size to a non-zero value |
Date: |
Tue, 6 Jan 2015 18:48:10 +0100 |
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 <address@hidden>
---
v2: fixed typo in commit message (s/mish/koly/)
---
block/dmg.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/block/dmg.c b/block/dmg.c
index 1a0fa0e..57feb1b 100644
--- a/block/dmg.c
+++ b/block/dmg.c
@@ -453,6 +453,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.2.1
- [Qemu-devel] [PATCH v2 00/12] block/dmg: (compatibility) fixes and bzip2 support, Peter Wu, 2015/01/06
- [Qemu-devel] [PATCH v2 05/12] block/dmg: validate chunk size to avoid overflow, Peter Wu, 2015/01/06
- [Qemu-devel] [PATCH v2 04/12] block/dmg: process a buffer instead of reading ints, Peter Wu, 2015/01/06
- [Qemu-devel] [PATCH v2 07/12] block/dmg: set virtual size to a non-zero value,
Peter Wu <=
- [Qemu-devel] [PATCH v2 08/12] block/dmg: fix sector data offset calculation, Peter Wu, 2015/01/06
- [Qemu-devel] [PATCH v2 09/12] block/dmg: use SectorNumber from BLKX header, Peter Wu, 2015/01/06
- [Qemu-devel] [PATCH v2 03/12] block/dmg: extract processing of resource forks, Peter Wu, 2015/01/06
- [Qemu-devel] [PATCH v2 01/12] block/dmg: properly detect the UDIF trailer, Peter Wu, 2015/01/06