diff options
author | Laszlo Ersek <lersek@redhat.com> | 2014-05-20 13:42:22 +0200 |
---|---|---|
committer | Luiz Capitulino <lcapitulino@redhat.com> | 2014-06-11 10:10:28 -0400 |
commit | c998acb03df614ddf2f3e206582586f191d07fff (patch) | |
tree | 78bc063dda8d084ff74e7f4bb5234cb002471a59 | |
parent | 24aeeace7a9f264688e9eda77b6c04db607cbdfd (diff) |
dump: hoist lzo_init() from get_len_buf_out() to dump_init()
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 <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>
-rw-r--r-- | dump.c | 13 |
1 files changed, 6 insertions, 7 deletions
@@ -1231,13 +1231,6 @@ static size_t get_len_buf_out(size_t page_size, uint32_t flag_compress) /* 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: @@ -1625,6 +1618,12 @@ static int dump_init(DumpState *s, int fd, bool has_format, 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; |