[Qemu-devel] [PATCH 6/7] dump: hoist lzo_init() from get_len_buf_out() to dump_init()

[Laszlo Ersek]

qmp_dump_guest_memory()
  dump_init()
    lzo_init() <---------+
  create_kdump_vmcore()  |
    write_dump_pages()   |
      get_len_buf_out()  |
        lzo_init() ------+

This patch doesn't change the fact that lzo_init() is called for every
LZO-compressed dump, but it makes get_len_buf_out() more focused (single
responsibility).

Suggested-by: Paolo Bonzini <address@hidden>
Signed-off-by: Laszlo Ersek <address@hidden>
---
 dump.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/dump.c b/dump.c
index 7e0982b..b87045e 100644
--- a/dump.c
+++ b/dump.c
@@ -1229,17 +1229,10 @@ static size_t get_len_buf_out(size_t page_size, 
uint32_t flag_compress)
     /* buf size for zlib */
     len_buf_out_zlib = compressBound(page_size);
 
     /* buf size for lzo */
 #ifdef CONFIG_LZO
-    if (flag_compress & DUMP_DH_COMPRESSED_LZO) {
-        if (lzo_init() != LZO_E_OK) {
-            /* return 0 to indicate lzo is unavailable */
-            return 0;
-        }
-    }
-
     /*
      * 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
      */
@@ -1623,10 +1616,16 @@ static int dump_init(DumpState *s, int fd, bool 
has_format,
         case DUMP_GUEST_MEMORY_FORMAT_KDUMP_ZLIB:
             s->flag_compress = DUMP_DH_COMPRESSED_ZLIB;
             break;
 
         case DUMP_GUEST_MEMORY_FORMAT_KDUMP_LZO:
+#ifdef CONFIG_LZO
+            if (lzo_init() != LZO_E_OK) {
+                error_setg(errp, "failed to initialize the LZO library");
+                goto cleanup;
+            }
+#endif
             s->flag_compress = DUMP_DH_COMPRESSED_LZO;
             break;
 
         case DUMP_GUEST_MEMORY_FORMAT_KDUMP_SNAPPY:
             s->flag_compress = DUMP_DH_COMPRESSED_SNAPPY;
-- 
1.8.3.1