[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/17] dump: simplify get_len_buf_out()
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PULL 07/17] dump: simplify get_len_buf_out() |
Date: |
Wed, 11 Jun 2014 10:50:52 -0400 |
From: Laszlo Ersek <address@hidden>
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 <address@hidden>
Signed-off-by: Laszlo Ersek <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>
---
dump.c | 46 ++++++++++++++++------------------------------
1 file changed, 16 insertions(+), 30 deletions(-)
diff --git a/dump.c b/dump.c
index b87045e..97d2c8d 100644
--- a/dump.c
+++ b/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)
{
- size_t len_buf_out_zlib, len_buf_out_lzo, len_buf_out_snappy;
- size_t len_buf_out;
-
- /* init buf_out */
- 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
- * 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
+ switch (flag_compress) {
+ case DUMP_DH_COMPRESSED_ZLIB:
+ return compressBound(page_size);
+
+ case DUMP_DH_COMPRESSED_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
+ */
+ return page_size + page_size / 16 + 64 + 3;
#ifdef CONFIG_SNAPPY
- /* buf size for snappy */
- len_buf_out_snappy = snappy_max_compressed_length(page_size);
+ case DUMP_DH_COMPRESSED_SNAPPY:
+ return snappy_max_compressed_length(page_size);
#endif
-
- /* get the biggest that can store all kinds of compressed page */
- len_buf_out = MAX(len_buf_out_zlib,
- MAX(len_buf_out_lzo, len_buf_out_snappy));
-
- return len_buf_out;
+ }
+ return 0;
}
/*
@@ -1284,10 +1273,7 @@ static int write_dump_pages(DumpState *s)
/* prepare buffer to store compressed data */
len_buf_out = get_len_buf_out(TARGET_PAGE_SIZE, s->flag_compress);
- if (len_buf_out == 0) {
- dump_error(s, "dump: failed to get length of output buffer.\n");
- goto out;
- }
+ assert(len_buf_out != 0);
#ifdef CONFIG_LZO
wrkmem = g_malloc(LZO1X_1_MEM_COMPRESS);
--
1.9.3
- [Qemu-devel] [PULL 00/17] QMP queue, Luiz Capitulino, 2014/06/11
- [Qemu-devel] [PULL 07/17] dump: simplify get_len_buf_out(),
Luiz Capitulino <=
- [Qemu-devel] [PULL 09/17] monitor: Add watchdog_action argument completion, Luiz Capitulino, 2014/06/11
- [Qemu-devel] [PULL 13/17] readline: Make completion strings always unique, Luiz Capitulino, 2014/06/11
- [Qemu-devel] [PULL 01/17] dump: fill in the flat header signature more pleasingly to the eye, Luiz Capitulino, 2014/06/11
- [Qemu-devel] [PULL 08/17] monitor: Add ringbuf_write and ringbuf_read argument completion, Luiz Capitulino, 2014/06/11
- [Qemu-devel] [PULL 02/17] dump: simplify write_start_flat_header(), Luiz Capitulino, 2014/06/11
- [Qemu-devel] [PULL 06/17] dump: hoist lzo_init() from get_len_buf_out() to dump_init(), Luiz Capitulino, 2014/06/11
- [Qemu-devel] [PULL 11/17] net: Export valid host network devices list, Luiz Capitulino, 2014/06/11
- [Qemu-devel] [PULL 12/17] monitor: Add host_net_add device argument completion, Luiz Capitulino, 2014/06/11
- [Qemu-devel] [PULL 05/17] dump: select header bitness based on ELF class, not ELF architecture, Luiz Capitulino, 2014/06/11
- [Qemu-devel] [PULL 04/17] dump: eliminate DumpState.page_size ("guest's page size"), Luiz Capitulino, 2014/06/11