| Message ID | 20200228092420.103757-7-quintela@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [PULL,01/15] multifd: Add multifd-compression parameter | expand |
> +########################################## > +# zstd check > + > +if test "$zstd" != "no" ; then > + if $pkg_config --exist libzstd ; then The option is spelled --exists. This is generating an error during configure. r~
Richard Henderson <richard.henderson@linaro.org> wrote: >> +########################################## >> +# zstd check >> + >> +if test "$zstd" != "no" ; then >> + if $pkg_config --exist libzstd ; then > > The option is spelled --exists. This is generating an error during configure. Ooops, you are right. Sending a patch. Just wondering why I didn't saw that error :-( Thanks, Juan.
Juan Quintela <quintela@redhat.com> writes: > Richard Henderson <richard.henderson@linaro.org> wrote: >>> +########################################## >>> +# zstd check >>> + >>> +if test "$zstd" != "no" ; then >>> + if $pkg_config --exist libzstd ; then >> >> The option is spelled --exists. This is generating an error during configure. > > Ooops, you are right. > > Sending a patch. Just wondering why I didn't saw that error :-( I was only noticing when re-directing output - otherwise you miss it in a fairly long scrollback. > > Thanks, Juan.
On Fri, 28 Feb 2020 at 09:28, Juan Quintela <quintela@redhat.com> wrote: > > Add it to several build systems to make testing good. > > Signed-off-by: Juan Quintela <quintela@redhat.com> > Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > .gitlab-ci.yml | 1 + > .travis.yml | 1 + > configure | 30 +++++++++++++++++++ > tests/docker/dockerfiles/centos7.docker | 3 +- > .../dockerfiles/fedora-i386-cross.docker | 3 +- > tests/docker/dockerfiles/fedora.docker | 3 +- > tests/docker/dockerfiles/ubuntu.docker | 1 + > tests/docker/dockerfiles/ubuntu1804.docker | 1 + > tests/vm/fedora | 5 +++- > tests/vm/freebsd | 3 ++ > tests/vm/netbsd | 3 ++ > tests/vm/openbsd | 3 ++ > 12 files changed, 53 insertions(+), 4 deletions(-) Hi; this patch changes some .docker files, but it has put the new line at the bottom of each package list, rather than at the correct point in the alphabetical order that the lists are in, for these 3 fedora/centos ones: > diff --git a/tests/docker/dockerfiles/centos7.docker b/tests/docker/dockerfiles/centos7.docker > index 562d65be9e..cdd72de7eb 100644 > --- a/tests/docker/dockerfiles/centos7.docker > +++ b/tests/docker/dockerfiles/centos7.docker > @@ -33,6 +33,7 @@ ENV PACKAGES \ > tar \ > vte-devel \ > xen-devel \ > - zlib-devel > + zlib-devel \ > + libzstd-devel > RUN yum install -y $PACKAGES > RUN rpm -q $PACKAGES | sort > /packages.txt > diff --git a/tests/docker/dockerfiles/fedora-i386-cross.docker b/tests/docker/dockerfiles/fedora-i386-cross.docker > index 9106cf9ebe..cd16cd1bfa 100644 > --- a/tests/docker/dockerfiles/fedora-i386-cross.docker > +++ b/tests/docker/dockerfiles/fedora-i386-cross.docker > @@ -7,7 +7,8 @@ ENV PACKAGES \ > gnutls-devel.i686 \ > nettle-devel.i686 \ > pixman-devel.i686 \ > - zlib-devel.i686 > + zlib-devel.i686 \ > + libzstd-devel.i686 > > RUN dnf install -y $PACKAGES > RUN rpm -q $PACKAGES | sort > /packages.txt > diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker > index 987a3c170a..a6522228c0 100644 > --- a/tests/docker/dockerfiles/fedora.docker > +++ b/tests/docker/dockerfiles/fedora.docker > @@ -92,7 +92,8 @@ ENV PACKAGES \ > vte291-devel \ > which \ > xen-devel \ > - zlib-devel > + zlib-devel \ > + libzstd-devel > ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3 > > RUN dnf install -y $PACKAGES The ubuntu ones are OK though: > diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker > index 4177f33691..b6c7b41ddd 100644 > --- a/tests/docker/dockerfiles/ubuntu.docker > +++ b/tests/docker/dockerfiles/ubuntu.docker > @@ -58,6 +58,7 @@ ENV PACKAGES flex bison \ > libvdeplug-dev \ > libvte-2.91-dev \ > libxen-dev \ > + libzstd-dev \ > make \ > python3-yaml \ > python3-sphinx \ > diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker > index 0766f94cf4..1efedeef99 100644 > --- a/tests/docker/dockerfiles/ubuntu1804.docker > +++ b/tests/docker/dockerfiles/ubuntu1804.docker > @@ -44,6 +44,7 @@ ENV PACKAGES flex bison \ > libvdeplug-dev \ > libvte-2.91-dev \ > libxen-dev \ > + libzstd-dev \ > make \ > python3-yaml \ > python3-sphinx \ Could somebody send a patch that fixes up the ordering, please? thanks -- PMM
Peter Maydell <peter.maydell@linaro.org> wrote: > On Fri, 28 Feb 2020 at 09:28, Juan Quintela <quintela@redhat.com> wrote: >> >> Add it to several build systems to make testing good. >> >> Signed-off-by: Juan Quintela <quintela@redhat.com> >> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> >> --- >> .gitlab-ci.yml | 1 + >> .travis.yml | 1 + >> configure | 30 +++++++++++++++++++ >> tests/docker/dockerfiles/centos7.docker | 3 +- >> .../dockerfiles/fedora-i386-cross.docker | 3 +- >> tests/docker/dockerfiles/fedora.docker | 3 +- >> tests/docker/dockerfiles/ubuntu.docker | 1 + >> tests/docker/dockerfiles/ubuntu1804.docker | 1 + >> tests/vm/fedora | 5 +++- >> tests/vm/freebsd | 3 ++ >> tests/vm/netbsd | 3 ++ >> tests/vm/openbsd | 3 ++ >> 12 files changed, 53 insertions(+), 4 deletions(-) > > Hi; this patch changes some .docker files, but it has > put the new line at the bottom of each package list, > rather than at the correct point in the alphabetical > order that the lists are in, for these 3 fedora/centos ones: ok. I mill send a patch for that. Sorry, Juan. > >> diff --git a/tests/docker/dockerfiles/centos7.docker b/tests/docker/dockerfiles/centos7.docker >> index 562d65be9e..cdd72de7eb 100644 >> --- a/tests/docker/dockerfiles/centos7.docker >> +++ b/tests/docker/dockerfiles/centos7.docker >> @@ -33,6 +33,7 @@ ENV PACKAGES \ >> tar \ >> vte-devel \ >> xen-devel \ >> - zlib-devel >> + zlib-devel \ >> + libzstd-devel >> RUN yum install -y $PACKAGES >> RUN rpm -q $PACKAGES | sort > /packages.txt >> diff --git a/tests/docker/dockerfiles/fedora-i386-cross.docker b/tests/docker/dockerfiles/fedora-i386-cross.docker >> index 9106cf9ebe..cd16cd1bfa 100644 >> --- a/tests/docker/dockerfiles/fedora-i386-cross.docker >> +++ b/tests/docker/dockerfiles/fedora-i386-cross.docker >> @@ -7,7 +7,8 @@ ENV PACKAGES \ >> gnutls-devel.i686 \ >> nettle-devel.i686 \ >> pixman-devel.i686 \ >> - zlib-devel.i686 >> + zlib-devel.i686 \ >> + libzstd-devel.i686 >> >> RUN dnf install -y $PACKAGES >> RUN rpm -q $PACKAGES | sort > /packages.txt >> diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker >> index 987a3c170a..a6522228c0 100644 >> --- a/tests/docker/dockerfiles/fedora.docker >> +++ b/tests/docker/dockerfiles/fedora.docker >> @@ -92,7 +92,8 @@ ENV PACKAGES \ >> vte291-devel \ >> which \ >> xen-devel \ >> - zlib-devel >> + zlib-devel \ >> + libzstd-devel >> ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3 >> >> RUN dnf install -y $PACKAGES > > The ubuntu ones are OK though: > >> diff --git a/tests/docker/dockerfiles/ubuntu.docker >> b/tests/docker/dockerfiles/ubuntu.docker >> index 4177f33691..b6c7b41ddd 100644 >> --- a/tests/docker/dockerfiles/ubuntu.docker >> +++ b/tests/docker/dockerfiles/ubuntu.docker >> @@ -58,6 +58,7 @@ ENV PACKAGES flex bison \ >> libvdeplug-dev \ >> libvte-2.91-dev \ >> libxen-dev \ >> + libzstd-dev \ >> make \ >> python3-yaml \ >> python3-sphinx \ >> diff --git a/tests/docker/dockerfiles/ubuntu1804.docker >> b/tests/docker/dockerfiles/ubuntu1804.docker >> index 0766f94cf4..1efedeef99 100644 >> --- a/tests/docker/dockerfiles/ubuntu1804.docker >> +++ b/tests/docker/dockerfiles/ubuntu1804.docker >> @@ -44,6 +44,7 @@ ENV PACKAGES flex bison \ >> libvdeplug-dev \ >> libvte-2.91-dev \ >> libxen-dev \ >> + libzstd-dev \ >> make \ >> python3-yaml \ >> python3-sphinx \ > > > Could somebody send a patch that fixes up the ordering, > please? > > thanks > -- PMM
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c15e394f09..72f8b8aa51 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,6 +21,7 @@ build-system2: script: - apt-get install -y -qq libsdl2-dev libgcrypt-dev libbrlapi-dev libaio-dev libfdt-dev liblzo2-dev librdmacm-dev libibverbs-dev libibumad-dev + libzstd-dev - mkdir build - cd build - ../configure --enable-werror --target-list="tricore-softmmu unicore32-softmmu diff --git a/.travis.yml b/.travis.yml index f4020dcc6c..9867272177 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,6 +49,7 @@ addons: - libusb-1.0-0-dev - libvdeplug-dev - libvte-2.91-dev + - libzstd-dev - sparse - uuid-dev - gcovr diff --git a/configure b/configure index 48d6f89d57..7b373bc0bb 100755 --- a/configure +++ b/configure @@ -449,6 +449,7 @@ lzo="" snappy="" bzip2="" lzfse="" +zstd="" guest_agent="" guest_agent_with_vss="no" guest_agent_ntddscsi="no" @@ -1371,6 +1372,10 @@ for opt do ;; --disable-lzfse) lzfse="no" ;; + --disable-zstd) zstd="no" + ;; + --enable-zstd) zstd="yes" + ;; --enable-guest-agent) guest_agent="yes" ;; --disable-guest-agent) guest_agent="no" @@ -1829,6 +1834,8 @@ disabled with --disable-FEATURE, default is enabled if available: (for reading bzip2-compressed dmg images) lzfse support of lzfse compression library (for reading lzfse-compressed dmg images) + zstd support for zstd compression library + (for migration compression) seccomp seccomp support coroutine-pool coroutine freelist (better performance) glusterfs GlusterFS backend @@ -2453,6 +2460,24 @@ EOF fi fi +########################################## +# zstd check + +if test "$zstd" != "no" ; then + if $pkg_config --exist libzstd ; then + zstd_cflags="$($pkg_config --cflags libzstd)" + zstd_libs="$($pkg_config --libs libzstd)" + LIBS="$zstd_libs $LIBS" + QEMU_CFLAGS="$QEMU_CFLAGS $zstd_cflags" + zstd="yes" + else + if test "$zstd" = "yes" ; then + feature_not_found "libzstd" "Install libzstd devel" + fi + zstd="no" + fi +fi + ########################################## # libseccomp check @@ -6668,6 +6693,7 @@ echo "lzo support $lzo" echo "snappy support $snappy" echo "bzip2 support $bzip2" echo "lzfse support $lzfse" +echo "zstd support $zstd" echo "NUMA host support $numa" echo "libxml2 $libxml2" echo "tcmalloc support $tcmalloc" @@ -7242,6 +7268,10 @@ if test "$lzfse" = "yes" ; then echo "LZFSE_LIBS=-llzfse" >> $config_host_mak fi +if test "$zstd" = "yes" ; then + echo "CONFIG_ZSTD=y" >> $config_host_mak +fi + if test "$libiscsi" = "yes" ; then echo "CONFIG_LIBISCSI=m" >> $config_host_mak echo "LIBISCSI_CFLAGS=$libiscsi_cflags" >> $config_host_mak diff --git a/tests/docker/dockerfiles/centos7.docker b/tests/docker/dockerfiles/centos7.docker index 562d65be9e..cdd72de7eb 100644 --- a/tests/docker/dockerfiles/centos7.docker +++ b/tests/docker/dockerfiles/centos7.docker @@ -33,6 +33,7 @@ ENV PACKAGES \ tar \ vte-devel \ xen-devel \ - zlib-devel + zlib-devel \ + libzstd-devel RUN yum install -y $PACKAGES RUN rpm -q $PACKAGES | sort > /packages.txt diff --git a/tests/docker/dockerfiles/fedora-i386-cross.docker b/tests/docker/dockerfiles/fedora-i386-cross.docker index 9106cf9ebe..cd16cd1bfa 100644 --- a/tests/docker/dockerfiles/fedora-i386-cross.docker +++ b/tests/docker/dockerfiles/fedora-i386-cross.docker @@ -7,7 +7,8 @@ ENV PACKAGES \ gnutls-devel.i686 \ nettle-devel.i686 \ pixman-devel.i686 \ - zlib-devel.i686 + zlib-devel.i686 \ + libzstd-devel.i686 RUN dnf install -y $PACKAGES RUN rpm -q $PACKAGES | sort > /packages.txt diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index 987a3c170a..a6522228c0 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -92,7 +92,8 @@ ENV PACKAGES \ vte291-devel \ which \ xen-devel \ - zlib-devel + zlib-devel \ + libzstd-devel ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3 RUN dnf install -y $PACKAGES diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker index 4177f33691..b6c7b41ddd 100644 --- a/tests/docker/dockerfiles/ubuntu.docker +++ b/tests/docker/dockerfiles/ubuntu.docker @@ -58,6 +58,7 @@ ENV PACKAGES flex bison \ libvdeplug-dev \ libvte-2.91-dev \ libxen-dev \ + libzstd-dev \ make \ python3-yaml \ python3-sphinx \ diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker index 0766f94cf4..1efedeef99 100644 --- a/tests/docker/dockerfiles/ubuntu1804.docker +++ b/tests/docker/dockerfiles/ubuntu1804.docker @@ -44,6 +44,7 @@ ENV PACKAGES flex bison \ libvdeplug-dev \ libvte-2.91-dev \ libxen-dev \ + libzstd-dev \ make \ python3-yaml \ python3-sphinx \ diff --git a/tests/vm/fedora b/tests/vm/fedora index 4d7d6049f4..4843b4175e 100755 --- a/tests/vm/fedora +++ b/tests/vm/fedora @@ -53,7 +53,10 @@ class FedoraVM(basevm.BaseVM): # libs: audio '"pkgconfig(libpulse)"', '"pkgconfig(alsa)"', - ] + + # libs: migration + '"pkgconfig(libzstd)"', +] BUILD_SCRIPT = """ set -e; diff --git a/tests/vm/freebsd b/tests/vm/freebsd index fb54334696..86770878b6 100755 --- a/tests/vm/freebsd +++ b/tests/vm/freebsd @@ -55,6 +55,9 @@ class FreeBSDVM(basevm.BaseVM): # libs: opengl "libepoxy", "mesa-libs", + + # libs: migration + "zstd", ] BUILD_SCRIPT = """ diff --git a/tests/vm/netbsd b/tests/vm/netbsd index c5069a45f4..55590f4601 100755 --- a/tests/vm/netbsd +++ b/tests/vm/netbsd @@ -49,6 +49,9 @@ class NetBSDVM(basevm.BaseVM): "SDL2", "gtk3+", "libxkbcommon", + + # libs: migration + "zstd", ] BUILD_SCRIPT = """ diff --git a/tests/vm/openbsd b/tests/vm/openbsd index 22cd9513dd..ab6abbedab 100755 --- a/tests/vm/openbsd +++ b/tests/vm/openbsd @@ -51,6 +51,9 @@ class OpenBSDVM(basevm.BaseVM): "sdl2", "gtk+3", "libxkbcommon", + + # libs: migration + "zstd", ] BUILD_SCRIPT = """