dmg: including dmg-lzfse module inside dmg block driver.
This commit includes the support to new module dmg-lzfse into dmg block driver. It includes the support for block type ULFO (0x80000007). Signed-off-by: Julio Faracco <jcfaracco@gmail.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
parent
83bc1f9768
commit
7a40b418ec
28
block/dmg.c
28
block/dmg.c
|
@ -33,6 +33,9 @@
|
||||||
int (*dmg_uncompress_bz2)(char *next_in, unsigned int avail_in,
|
int (*dmg_uncompress_bz2)(char *next_in, unsigned int avail_in,
|
||||||
char *next_out, unsigned int avail_out);
|
char *next_out, unsigned int avail_out);
|
||||||
|
|
||||||
|
int (*dmg_uncompress_lzfse)(char *next_in, unsigned int avail_in,
|
||||||
|
char *next_out, unsigned int avail_out);
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
/* Limit chunk sizes to prevent unreasonable amounts of memory being used
|
/* Limit chunk sizes to prevent unreasonable amounts of memory being used
|
||||||
* or truncating when converting to 32-bit types
|
* or truncating when converting to 32-bit types
|
||||||
|
@ -107,6 +110,7 @@ static void update_max_chunk_size(BDRVDMGState *s, uint32_t chunk,
|
||||||
switch (s->types[chunk]) {
|
switch (s->types[chunk]) {
|
||||||
case 0x80000005: /* zlib compressed */
|
case 0x80000005: /* zlib compressed */
|
||||||
case 0x80000006: /* bzip2 compressed */
|
case 0x80000006: /* bzip2 compressed */
|
||||||
|
case 0x80000007: /* lzfse compressed */
|
||||||
compressed_size = s->lengths[chunk];
|
compressed_size = s->lengths[chunk];
|
||||||
uncompressed_sectors = s->sectorcounts[chunk];
|
uncompressed_sectors = s->sectorcounts[chunk];
|
||||||
break;
|
break;
|
||||||
|
@ -188,6 +192,8 @@ static bool dmg_is_known_block_type(uint32_t entry_type)
|
||||||
return true;
|
return true;
|
||||||
case 0x80000006: /* bzip2 */
|
case 0x80000006: /* bzip2 */
|
||||||
return !!dmg_uncompress_bz2;
|
return !!dmg_uncompress_bz2;
|
||||||
|
case 0x80000007: /* lzfse */
|
||||||
|
return !!dmg_uncompress_lzfse;
|
||||||
default:
|
default:
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -425,6 +431,7 @@ static int dmg_open(BlockDriverState *bs, QDict *options, int flags,
|
||||||
}
|
}
|
||||||
|
|
||||||
block_module_load_one("dmg-bz2");
|
block_module_load_one("dmg-bz2");
|
||||||
|
block_module_load_one("dmg-lzfse");
|
||||||
|
|
||||||
s->n_chunks = 0;
|
s->n_chunks = 0;
|
||||||
s->offsets = s->lengths = s->sectors = s->sectorcounts = NULL;
|
s->offsets = s->lengths = s->sectors = s->sectorcounts = NULL;
|
||||||
|
@ -623,6 +630,27 @@ static inline int dmg_read_chunk(BlockDriverState *bs, uint64_t sector_num)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case 0x80000007:
|
||||||
|
if (!dmg_uncompress_lzfse) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
/* we need to buffer, because only the chunk as whole can be
|
||||||
|
* inflated. */
|
||||||
|
ret = bdrv_pread(bs->file, s->offsets[chunk],
|
||||||
|
s->compressed_chunk, s->lengths[chunk]);
|
||||||
|
if (ret != s->lengths[chunk]) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
ret = dmg_uncompress_lzfse((char *)s->compressed_chunk,
|
||||||
|
(unsigned int) s->lengths[chunk],
|
||||||
|
(char *)s->uncompressed_chunk,
|
||||||
|
(unsigned int)
|
||||||
|
(512 * s->sectorcounts[chunk]));
|
||||||
|
if (ret < 0) {
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
break;
|
||||||
case 1: /* copy */
|
case 1: /* copy */
|
||||||
ret = bdrv_pread(bs->file, s->offsets[chunk],
|
ret = bdrv_pread(bs->file, s->offsets[chunk],
|
||||||
s->uncompressed_chunk, s->lengths[chunk]);
|
s->uncompressed_chunk, s->lengths[chunk]);
|
||||||
|
|
|
@ -55,4 +55,7 @@ typedef struct BDRVDMGState {
|
||||||
extern int (*dmg_uncompress_bz2)(char *next_in, unsigned int avail_in,
|
extern int (*dmg_uncompress_bz2)(char *next_in, unsigned int avail_in,
|
||||||
char *next_out, unsigned int avail_out);
|
char *next_out, unsigned int avail_out);
|
||||||
|
|
||||||
|
extern int (*dmg_uncompress_lzfse)(char *next_in, unsigned int avail_in,
|
||||||
|
char *next_out, unsigned int avail_out);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue