On Mon, Jul 28, 2014 at 08:23:52PM +0400, Denis V. Lunev wrote:
> Parallels image format has several additional fields inside:
> - nb_sectors is actually 64 bit wide. Upper 32bits are not used for
> images with signature "WithoutFreeSpace" and must be explicitly
> zeroed according to Parallels. They will be used for images with
> signature "WithouFreSpacExt"
> - inuse is magic which means that the image is currently opened for
> read/write or was not closed correctly, the magic is 0x746f6e59
> - data_off is the location of the first data block. It can be zero
> and in this case data starts just beyond the header aligned to
> 512 bytes. Though this field does not matter for read-only driver
>
> This patch adds these values to struct parallels_header and adds
> proper handling of nb_sectors for currently supported WithoutFreeSpace
> images.
>
> WithouFreSpacExt will be covered in next patches.
>
> Signed-off-by: Denis V. Lunev
> CC: Kevin Wolf
> CC: Stefan Hajnoczi
> CC: Jeff Cody
> ---
> block/parallels.c | 8 +---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/block/parallels.c b/block/parallels.c
> index 1a5bd35..e39 100644
> --- a/block/parallels.c
> +++ b/block/parallels.c
> @@ -41,8 +41,10 @@ struct parallels_header {
> uint32_t cylinders;
> uint32_t tracks;
> uint32_t catalog_entries;
> -uint32_t nb_sectors;
> -char padding[24];
> +uint64_t nb_sectors;
> +uint32_t inuse;
> +uint32_t data_off;
> +char padding[12];
> } QEMU_PACKED;
>
> typedef struct BDRVParallelsState {
> @@ -90,7 +92,7 @@ static int parallels_open(BlockDriverState *bs, QDict
> *options, int flags,
> goto fail;
> }
>
> -bs->total_sectors = le32_to_cpu(ph.nb_sectors);
> +bs->total_sectors = 0x & le64_to_cpu(ph.nb_sectors);
>
> s->tracks = le32_to_cpu(ph.tracks);
> if (s->tracks == 0) {
> --
> 1.9.1
>
>
Reviewed-by: Jeff Cody