From patchwork Tue May 20 11:42:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laszlo Ersek X-Patchwork-Id: 350658 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id C1490140083 for ; Tue, 20 May 2014 21:43:00 +1000 (EST) Received: from localhost ([::1]:52646 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WmiRe-0005mq-1l for incoming@patchwork.ozlabs.org; Tue, 20 May 2014 07:42:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52102) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WmiRJ-0005SC-Re for qemu-devel@nongnu.org; Tue, 20 May 2014 07:42:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WmiRE-0000LR-Oh for qemu-devel@nongnu.org; Tue, 20 May 2014 07:42:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35354) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WmiRE-0000LJ-G3 for qemu-devel@nongnu.org; Tue, 20 May 2014 07:42:32 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s4KBgQxI028791 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 20 May 2014 07:42:26 -0400 Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-64.ams2.redhat.com [10.36.116.64]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id s4KBgNAK019659; Tue, 20 May 2014 07:42:24 -0400 From: Laszlo Ersek To: qemu-devel@nongnu.org, Luiz Capitulino , Qiao Nuohan , Paolo Bonzini , Ekaterina Tumanova , Christian Borntraeger , "Aneesh Kumar K.V" Date: Tue, 20 May 2014 13:42:22 +0200 Message-Id: <1400586142-6428-1-git-send-email-lersek@redhat.com> In-Reply-To: <1400585987-6285-1-git-send-email-lersek@redhat.com> References: <1400585987-6285-1-git-send-email-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 6/7] dump: hoist lzo_init() from get_len_buf_out() to dump_init() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- 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;