From de36e8e95346b91cd9c9b6f497af910f4b5b8b11 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Tue, 17 Jun 2014 13:11:47 +0200 Subject: [PATCH 07/44] dump: hoist lzo_init() from get_len_buf_out() to dump_init() RH-Author: Laszlo Ersek Message-id: <1403010708-7504-8-git-send-email-lersek@redhat.com> Patchwork-id: 59256 O-Subject: [RHEL-6.6 qemu-kvm PATCH 7/8] dump: hoist lzo_init() from get_len_buf_out() to dump_init() Bugzilla: 1102659 RH-Acked-by: Luiz Capitulino RH-Acked-by: Dr. David Alan Gilbert (git) RH-Acked-by: Markus Armbruster 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 Signed-off-by: Laszlo Ersek Reviewed-by: Paolo Bonzini Signed-off-by: Luiz Capitulino (cherry picked from commit c998acb03df614ddf2f3e206582586f191d07fff) --- dump.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) Signed-off-by: Miroslav Rezanina --- dump.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dump.c b/dump.c index 510a5b5..2167487 100644 --- a/dump.c +++ b/dump.c @@ -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: @@ -1620,6 +1613,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; -- 1.7.1