diff mbox series

Revert "gitlab: disable accelerated zlib for s390x"

Message ID 20220720082844.6700-1-dgilbert@redhat.com (mailing list archive)
State New, archived
Headers show
Series Revert "gitlab: disable accelerated zlib for s390x" | expand

Commit Message

Dr. David Alan Gilbert July 20, 2022, 8:28 a.m. UTC 
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

This reverts commit 309df6acb29346f89e1ee542b1986f60cab12b87.
With Ilya's 'multifd: Copy pages before compressing them with zlib'
in the latest migration series, this shouldn't be a problem any more.

Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
 .gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml | 12 ------------
 .travis.yml                                        |  6 ++----
 2 files changed, 2 insertions(+), 16 deletions(-)

Comments

Thomas Huth July 20, 2022, 8:31 a.m. UTC | #1 
On 20/07/2022 10.28, Dr. David Alan Gilbert (git) wrote:
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
> 
> This reverts commit 309df6acb29346f89e1ee542b1986f60cab12b87.
> With Ilya's 'multifd: Copy pages before compressing them with zlib'
> in the latest migration series, this shouldn't be a problem any more.
> 
> Suggested-by: Peter Maydell <peter.maydell@linaro.org>
> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> ---
>   .gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml | 12 ------------
>   .travis.yml                                        |  6 ++----
>   2 files changed, 2 insertions(+), 16 deletions(-)
> 
> diff --git a/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml b/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml
> index 9f1fe9e7dc..03e74c97db 100644
> --- a/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml
> +++ b/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml
> @@ -8,8 +8,6 @@ ubuntu-20.04-s390x-all-linux-static:
>    tags:
>    - ubuntu_20.04
>    - s390x
> - variables:
> -    DFLTCC: 0
>    rules:
>    - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
>    - if: "$S390X_RUNNER_AVAILABLE"
> @@ -29,8 +27,6 @@ ubuntu-20.04-s390x-all:
>    tags:
>    - ubuntu_20.04
>    - s390x
> - variables:
> -    DFLTCC: 0
>    timeout: 75m
>    rules:
>    - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
> @@ -48,8 +44,6 @@ ubuntu-20.04-s390x-alldbg:
>    tags:
>    - ubuntu_20.04
>    - s390x
> - variables:
> -    DFLTCC: 0
>    rules:
>    - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
>      when: manual
> @@ -71,8 +65,6 @@ ubuntu-20.04-s390x-clang:
>    tags:
>    - ubuntu_20.04
>    - s390x
> - variables:
> -    DFLTCC: 0
>    rules:
>    - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
>      when: manual
> @@ -93,8 +85,6 @@ ubuntu-20.04-s390x-tci:
>    tags:
>    - ubuntu_20.04
>    - s390x
> - variables:
> -    DFLTCC: 0
>    rules:
>    - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
>      when: manual
> @@ -114,8 +104,6 @@ ubuntu-20.04-s390x-notcg:
>    tags:
>    - ubuntu_20.04
>    - s390x
> - variables:
> -    DFLTCC: 0
>    rules:
>    - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
>      when: manual
> diff --git a/.travis.yml b/.travis.yml
> index 4fdc9a6785..fb3baabca9 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -218,7 +218,6 @@ jobs:
>           - TEST_CMD="make check check-tcg V=1"
>           - CONFIG="--disable-containers --target-list=${MAIN_SOFTMMU_TARGETS},s390x-linux-user"
>           - UNRELIABLE=true
> -        - DFLTCC=0
>         script:
>           - BUILD_RC=0 && make -j${JOBS} || BUILD_RC=$?
>           - |
> @@ -258,7 +257,7 @@ jobs:
>         env:
>           - CONFIG="--disable-containers --audio-drv-list=sdl --disable-user
>                     --target-list-exclude=${MAIN_SOFTMMU_TARGETS}"
> -        - DFLTCC=0
> +
>       - name: "[s390x] GCC (user)"
>         arch: s390x
>         dist: focal
> @@ -270,7 +269,7 @@ jobs:
>             - ninja-build
>         env:
>           - CONFIG="--disable-containers --disable-system"
> -        - DFLTCC=0
> +
>       - name: "[s390x] Clang (disable-tcg)"
>         arch: s390x
>         dist: focal
> @@ -304,4 +303,3 @@ jobs:
>           - CONFIG="--disable-containers --disable-tcg --enable-kvm
>                     --disable-tools --host-cc=clang --cxx=clang++"
>           - UNRELIABLE=true
> -        - DFLTCC=0

Reviewed-by: Thomas Huth <thuth@redhat.com>
Dr. David Alan Gilbert July 20, 2022, 8:34 a.m. UTC | #2 
* Thomas Huth (thuth@redhat.com) wrote:
> On 20/07/2022 10.28, Dr. David Alan Gilbert (git) wrote:
> > From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
> > 
> > This reverts commit 309df6acb29346f89e1ee542b1986f60cab12b87.
> > With Ilya's 'multifd: Copy pages before compressing them with zlib'
> > in the latest migration series, this shouldn't be a problem any more.
> > 
> > Suggested-by: Peter Maydell <peter.maydell@linaro.org>
> > Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> > ---
> >   .gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml | 12 ------------
> >   .travis.yml                                        |  6 ++----
> >   2 files changed, 2 insertions(+), 16 deletions(-)
> > 
> > diff --git a/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml b/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml
> > index 9f1fe9e7dc..03e74c97db 100644
> > --- a/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml
> > +++ b/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml
> > @@ -8,8 +8,6 @@ ubuntu-20.04-s390x-all-linux-static:
> >    tags:
> >    - ubuntu_20.04
> >    - s390x
> > - variables:
> > -    DFLTCC: 0
> >    rules:
> >    - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
> >    - if: "$S390X_RUNNER_AVAILABLE"
> > @@ -29,8 +27,6 @@ ubuntu-20.04-s390x-all:
> >    tags:
> >    - ubuntu_20.04
> >    - s390x
> > - variables:
> > -    DFLTCC: 0
> >    timeout: 75m
> >    rules:
> >    - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
> > @@ -48,8 +44,6 @@ ubuntu-20.04-s390x-alldbg:
> >    tags:
> >    - ubuntu_20.04
> >    - s390x
> > - variables:
> > -    DFLTCC: 0
> >    rules:
> >    - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
> >      when: manual
> > @@ -71,8 +65,6 @@ ubuntu-20.04-s390x-clang:
> >    tags:
> >    - ubuntu_20.04
> >    - s390x
> > - variables:
> > -    DFLTCC: 0
> >    rules:
> >    - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
> >      when: manual
> > @@ -93,8 +85,6 @@ ubuntu-20.04-s390x-tci:
> >    tags:
> >    - ubuntu_20.04
> >    - s390x
> > - variables:
> > -    DFLTCC: 0
> >    rules:
> >    - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
> >      when: manual
> > @@ -114,8 +104,6 @@ ubuntu-20.04-s390x-notcg:
> >    tags:
> >    - ubuntu_20.04
> >    - s390x
> > - variables:
> > -    DFLTCC: 0
> >    rules:
> >    - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
> >      when: manual
> > diff --git a/.travis.yml b/.travis.yml
> > index 4fdc9a6785..fb3baabca9 100644
> > --- a/.travis.yml
> > +++ b/.travis.yml
> > @@ -218,7 +218,6 @@ jobs:
> >           - TEST_CMD="make check check-tcg V=1"
> >           - CONFIG="--disable-containers --target-list=${MAIN_SOFTMMU_TARGETS},s390x-linux-user"
> >           - UNRELIABLE=true
> > -        - DFLTCC=0
> >         script:
> >           - BUILD_RC=0 && make -j${JOBS} || BUILD_RC=$?
> >           - |
> > @@ -258,7 +257,7 @@ jobs:
> >         env:
> >           - CONFIG="--disable-containers --audio-drv-list=sdl --disable-user
> >                     --target-list-exclude=${MAIN_SOFTMMU_TARGETS}"
> > -        - DFLTCC=0
> > +
> >       - name: "[s390x] GCC (user)"
> >         arch: s390x
> >         dist: focal
> > @@ -270,7 +269,7 @@ jobs:
> >             - ninja-build
> >         env:
> >           - CONFIG="--disable-containers --disable-system"
> > -        - DFLTCC=0
> > +
> >       - name: "[s390x] Clang (disable-tcg)"
> >         arch: s390x
> >         dist: focal
> > @@ -304,4 +303,3 @@ jobs:
> >           - CONFIG="--disable-containers --disable-tcg --enable-kvm
> >                     --disable-tools --host-cc=clang --cxx=clang++"
> >           - UNRELIABLE=true
> > -        - DFLTCC=0
> 
> Reviewed-by: Thomas Huth <thuth@redhat.com>

Thanks, I'll include it in my reworked migration pull.

Dave
diff mbox series

Patch

diff --git a/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml b/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml
index 9f1fe9e7dc..03e74c97db 100644
--- a/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml
+++ b/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml
@@ -8,8 +8,6 @@  ubuntu-20.04-s390x-all-linux-static:
  tags:
  - ubuntu_20.04
  - s390x
- variables:
-    DFLTCC: 0
  rules:
  - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
  - if: "$S390X_RUNNER_AVAILABLE"
@@ -29,8 +27,6 @@  ubuntu-20.04-s390x-all:
  tags:
  - ubuntu_20.04
  - s390x
- variables:
-    DFLTCC: 0
  timeout: 75m
  rules:
  - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
@@ -48,8 +44,6 @@  ubuntu-20.04-s390x-alldbg:
  tags:
  - ubuntu_20.04
  - s390x
- variables:
-    DFLTCC: 0
  rules:
  - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
    when: manual
@@ -71,8 +65,6 @@  ubuntu-20.04-s390x-clang:
  tags:
  - ubuntu_20.04
  - s390x
- variables:
-    DFLTCC: 0
  rules:
  - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
    when: manual
@@ -93,8 +85,6 @@  ubuntu-20.04-s390x-tci:
  tags:
  - ubuntu_20.04
  - s390x
- variables:
-    DFLTCC: 0
  rules:
  - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
    when: manual
@@ -114,8 +104,6 @@  ubuntu-20.04-s390x-notcg:
  tags:
  - ubuntu_20.04
  - s390x
- variables:
-    DFLTCC: 0
  rules:
  - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
    when: manual
diff --git a/.travis.yml b/.travis.yml
index 4fdc9a6785..fb3baabca9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -218,7 +218,6 @@  jobs:
         - TEST_CMD="make check check-tcg V=1"
         - CONFIG="--disable-containers --target-list=${MAIN_SOFTMMU_TARGETS},s390x-linux-user"
         - UNRELIABLE=true
-        - DFLTCC=0
       script:
         - BUILD_RC=0 && make -j${JOBS} || BUILD_RC=$?
         - |
@@ -258,7 +257,7 @@  jobs:
       env:
         - CONFIG="--disable-containers --audio-drv-list=sdl --disable-user
                   --target-list-exclude=${MAIN_SOFTMMU_TARGETS}"
-        - DFLTCC=0
+
     - name: "[s390x] GCC (user)"
       arch: s390x
       dist: focal
@@ -270,7 +269,7 @@  jobs:
           - ninja-build
       env:
         - CONFIG="--disable-containers --disable-system"
-        - DFLTCC=0
+
     - name: "[s390x] Clang (disable-tcg)"
       arch: s390x
       dist: focal
@@ -304,4 +303,3 @@  jobs:
         - CONFIG="--disable-containers --disable-tcg --enable-kvm
                   --disable-tools --host-cc=clang --cxx=clang++"
         - UNRELIABLE=true
-        - DFLTCC=0