| Message ID | 1419692504-29373-8-git-send-email-peter@lekensteyn.nl |
|---|---|
| State | New |
| Headers | show |
On 12/27/2014 10:01 AM, Peter Wu wrote: > 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. > Do you mean to say from the 'koly' header? http://en.wikipedia.org/wiki/Apple_Disk_Image#UDIF_data_format > 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 <peter@lekensteyn.nl> > --- > 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); >
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);
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 <peter@lekensteyn.nl> --- block/dmg.c | 8 ++++++++ 1 file changed, 8 insertions(+)