haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

dump: simplify get_len_buf_out()

Browse source 
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:
Laszlo Ersek 2014-05-20 13:42:53 +02:00 committed by Luiz Capitulino
parent c998acb03d
commit b87ef3518b
1 changed files with 15 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
dump.c
View file

@ -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; /*
* LZO will expand incompressible data by a little amount. Please check
/* buf size for zlib */ * the following URL to see the expansion calculation:
len_buf_out_zlib = compressBound(page_size); * http://www.oberhumer.com/opensource/lzo/lzofaq.php
*/
/* buf size for lzo */ return page_size + page_size / 16 + 64 + 3;
#ifdef CONFIG_LZO
/*
* LZO will expand incompressible data by a little amount. please check the
* following URL to see the expansion calculation:
* http://www.oberhumer.com/opensource/lzo/lzofaq.php
*/
len_buf_out_lzo = 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);