From patchwork Fri Aug 10 04:07:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julio Faracco X-Patchwork-Id: 955931 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="dU3nMXXB"; dkim-atps=neutral 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 41ms9s6Dzlz9s4Z for ; Fri, 10 Aug 2018 14:10:57 +1000 (AEST) Received: from localhost ([::1]:54180 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnylL-0003Ix-IG for incoming@patchwork.ozlabs.org; Fri, 10 Aug 2018 00:10:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55735) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnyio-0000ri-Ti for qemu-devel@nongnu.org; Fri, 10 Aug 2018 00:08:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fnyin-0002eQ-5H for qemu-devel@nongnu.org; Fri, 10 Aug 2018 00:08:18 -0400 Received: from mail-qt0-x230.google.com ([2607:f8b0:400d:c0d::230]:43317) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fnyin-0002dq-08; Fri, 10 Aug 2018 00:08:17 -0400 Received: by mail-qt0-x230.google.com with SMTP id f18-v6so8986270qtp.10; Thu, 09 Aug 2018 21:08:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=LKlDIY7t/ouvBMe8x6xTFB1lk/l9jl/KWpOoYzTpoNs=; b=dU3nMXXBCm/HrGbXHLNvPC3geDm0tHi35St7T8SLv74NwoDN5BVgKv8PPeIa2cmGOk yvczEygAFIrJMhGeqO2SY4P7/wAphMlihORdTYQI7WtW/yuYUBMpeHnr/5WVwdhWwdTG QtI5spRLAA0q4jn+hJmiDERgOHnF+0l0eZsBstZjjewrN8vXhJ6PHlKP99oUThCk2rm0 RJ0rTfXG8YA9GSrLBpJlXSbGTL4OtnvXXS1xm2ifDuXgs3QddKt2YH2v9xtXAGngrM/m 2Gt4QW46l0gEZwU35Jk95A5p5sxOcxvBNO3tVFL2UgqIY3OWjq5Yyqs1T8Hk0LgOhKOv R6CQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=LKlDIY7t/ouvBMe8x6xTFB1lk/l9jl/KWpOoYzTpoNs=; b=WnQzDE6Pcwat8Wom/pgPzOLDDk5DrxPJdAN6PQ13KSlTL//OLlu37Y3xik6fUysvPL TqbBXAiAd1sDN/+Q0H8q2wy+oZ/joArfEDnggdTFclGeab7Hci4aQf/04a+nN98ntxXC YhwCZKeogkA7hW8dpGG/XGtudcv6UeqXb3mevk1g0zOJVROt3GTSDcOSS8ZkYdkG2mvw Xzi9vVr0i1CsdS5epuPmRMHp5qYlZ+YQ8l7t+PUD8u+poig9pcm7hh82sD84h9uqJHPO XE/Z1Wwz3hJLNKIvYAQPumjDdfZSTTGFGOPff/jZ4XOUiUhGZ0lANXmkumd+4X2L3kjd Bkug== X-Gm-Message-State: AOUpUlEALrW8BrMxJbZQRmDzLJqGyDqke+6ol/kzWhDEZeqHKNwAZSxt 6HolOHf1yaNKH96USI6hyEphl/N/ X-Google-Smtp-Source: AA+uWPzUWGuYkBjW6pNEl3Jf/ZFqPrAISBw0D4Uwh8MKpwkzq3unqOYD8mPyDL/IMWsq67TKUqjh8A== X-Received: by 2002:ac8:95a:: with SMTP id z26-v6mr4929966qth.211.1533874096012; Thu, 09 Aug 2018 21:08:16 -0700 (PDT) Received: from localhost.localdomain ([186.223.91.15]) by smtp.gmail.com with ESMTPSA id s53-v6sm6561555qts.5.2018.08.09.21.08.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Aug 2018 21:08:15 -0700 (PDT) From: Julio Faracco To: qemu-devel@nongnu.org Date: Fri, 10 Aug 2018 01:07:41 -0300 Message-Id: <20180810040743.25424-3-jcfaracco@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180810040743.25424-1-jcfaracco@gmail.com> References: <20180810040743.25424-1-jcfaracco@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::230 Subject: [Qemu-devel] [PATCH 2/4] configure: adding support to lzfse library. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, qemu-block@nongnu.org, stefanha@redhat.com, mreitz@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This commit includes the support to lzfse opensource library. With this library dmg block driver can decompress images with this type of compression inside. Signed-off-by: Julio Faracco --- block/Makefile.objs | 2 ++ configure | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/block/Makefile.objs b/block/Makefile.objs index c8337bf186..f4ddbb9c7b 100644 --- a/block/Makefile.objs +++ b/block/Makefile.objs @@ -47,6 +47,8 @@ ssh.o-cflags := $(LIBSSH2_CFLAGS) ssh.o-libs := $(LIBSSH2_LIBS) block-obj-$(if $(CONFIG_BZIP2),m,n) += dmg-bz2.o dmg-bz2.o-libs := $(BZIP2_LIBS) +block-obj-$(if $(CONFIG_LZFSE),m,n) += dmg-lzfse.o +dmg-lzfse.o-libs := $(LZFSE_LIBS) qcow.o-libs := -lz linux-aio.o-libs := -laio parallels.o-cflags := $(LIBXML2_CFLAGS) diff --git a/configure b/configure index 2a7796ea80..b12a16f2bf 100755 --- a/configure +++ b/configure @@ -432,6 +432,7 @@ capstone="" lzo="" snappy="" bzip2="" +lzfse="" guest_agent="" guest_agent_with_vss="no" guest_agent_ntddscsi="no" @@ -1300,6 +1301,10 @@ for opt do ;; --enable-bzip2) bzip2="yes" ;; + --enable-lzfse) lzfse="yes" + ;; + --disable-lzfse) lzfse="no" + ;; --enable-guest-agent) guest_agent="yes" ;; --disable-guest-agent) guest_agent="no" @@ -1689,6 +1694,8 @@ disabled with --disable-FEATURE, default is enabled if available: snappy support of snappy compression library bzip2 support of bzip2 compression library (for reading bzip2-compressed dmg images) + lzfse support of lzfse compression library + (for reading lzfse-compressed dmg images) seccomp seccomp support coroutine-pool coroutine freelist (better performance) glusterfs GlusterFS backend @@ -2213,6 +2220,25 @@ EOF fi fi +########################################## +# lzfse check + +if test "$lzfse" != "no" ; then + cat > $TMPC << EOF +#include +int main(void) { lzfse_decode_scratch_size(); return 0; } +EOF + if compile_prog "" "-llzfse" ; then + libs_softmmu="$libs_softmmu -llzfse" + lzfse="yes" + else + if test "$lzfse" = "yes"; then + feature_not_found "lzfse" "Install lzfse devel" + fi + lzfse="no" + fi +fi + ########################################## # libseccomp check @@ -6001,6 +6027,7 @@ echo "Live block migration $live_block_migration" echo "lzo support $lzo" echo "snappy support $snappy" echo "bzip2 support $bzip2" +echo "lzfse support $lzfse" echo "NUMA host support $numa" echo "libxml2 $libxml2" echo "tcmalloc support $tcmalloc" @@ -6525,6 +6552,11 @@ if test "$bzip2" = "yes" ; then echo "BZIP2_LIBS=-lbz2" >> $config_host_mak fi +if test "$lzfse" = "yes" ; then + echo "CONFIG_LZFSE=y" >> $config_host_mak + echo "LZFSE_LIBS=-llzfse" >> $config_host_mak +fi + if test "$libiscsi" = "yes" ; then echo "CONFIG_LIBISCSI=m" >> $config_host_mak echo "LIBISCSI_CFLAGS=$libiscsi_cflags" >> $config_host_mak