dump: simplify get_len_buf_out()
We can (and should) rely on the fact that s->flag_compress is exactly one of DUMP_DH_COMPRESSED_ZLIB, DUMP_DH_COMPRESSED_LZO, and DUMP_DH_COMPRESSED_SNAPPY. This is ensured by the QMP schema and dump_init() in combination. Suggested-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
parent
c998acb03d
commit
b87ef3518b
38
dump.c
38
dump.c
|
@ -1220,35 +1220,24 @@ static void free_data_cache(DataCache *data_cache)
|
||||||
|
|
||||||
static size_t get_len_buf_out(size_t page_size, uint32_t flag_compress)
|
static size_t get_len_buf_out(size_t page_size, uint32_t flag_compress)
|
||||||
{
|
{
|
||||||
size_t len_buf_out_zlib, len_buf_out_lzo, len_buf_out_snappy;
|
switch (flag_compress) {
|
||||||
size_t len_buf_out;
|
case DUMP_DH_COMPRESSED_ZLIB:
|
||||||
|
return compressBound(page_size);
|
||||||
|
|
||||||
/* init buf_out */
|
case DUMP_DH_COMPRESSED_LZO:
|
||||||
len_buf_out_zlib = len_buf_out_lzo = len_buf_out_snappy = 0;
|
|
||||||
|
|
||||||
/* buf size for zlib */
|
|
||||||
len_buf_out_zlib = compressBound(page_size);
|
|
||||||
|
|
||||||
/* buf size for lzo */
|
|
||||||
#ifdef CONFIG_LZO
|
|
||||||
/*
|
/*
|
||||||
* LZO will expand incompressible data by a little amount. please check the
|
* LZO will expand incompressible data by a little amount. Please check
|
||||||
* following URL to see the expansion calculation:
|
* the following URL to see the expansion calculation:
|
||||||
* http://www.oberhumer.com/opensource/lzo/lzofaq.php
|
* http://www.oberhumer.com/opensource/lzo/lzofaq.php
|
||||||
*/
|
*/
|
||||||
len_buf_out_lzo = page_size + page_size / 16 + 64 + 3;
|
return page_size + page_size / 16 + 64 + 3;
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef CONFIG_SNAPPY
|
#ifdef CONFIG_SNAPPY
|
||||||
/* buf size for snappy */
|
case DUMP_DH_COMPRESSED_SNAPPY:
|
||||||
len_buf_out_snappy = snappy_max_compressed_length(page_size);
|
return snappy_max_compressed_length(page_size);
|
||||||
#endif
|
#endif
|
||||||
|
}
|
||||||
/* get the biggest that can store all kinds of compressed page */
|
return 0;
|
||||||
len_buf_out = MAX(len_buf_out_zlib,
|
|
||||||
MAX(len_buf_out_lzo, len_buf_out_snappy));
|
|
||||||
|
|
||||||
return len_buf_out;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -1284,10 +1273,7 @@ static int write_dump_pages(DumpState *s)
|
||||||
|
|
||||||
/* prepare buffer to store compressed data */
|
/* prepare buffer to store compressed data */
|
||||||
len_buf_out = get_len_buf_out(TARGET_PAGE_SIZE, s->flag_compress);
|
len_buf_out = get_len_buf_out(TARGET_PAGE_SIZE, s->flag_compress);
|
||||||
if (len_buf_out == 0) {
|
assert(len_buf_out != 0);
|
||||||
dump_error(s, "dump: failed to get length of output buffer.\n");
|
|
||||||
goto out;
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef CONFIG_LZO
|
#ifdef CONFIG_LZO
|
||||||
wrkmem = g_malloc(LZO1X_1_MEM_COMPRESS);
|
wrkmem = g_malloc(LZO1X_1_MEM_COMPRESS);
|
||||||
|
|
Loading…
Reference in a new issue