mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "gitlab: disable accelerated zlib for s390x"

Browse Source 
This reverts commit 309df6acb2.
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>
Reviewed-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Dr. David Alan Gilbert 2022-07-20 09:25:47 +01:00
parent 90eb69e4f1
commit db727a1410
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml
View File

@ -8,8 +8,6 @@ ubuntu-20.04-s390x-all-linux-static:
tags: tags:
- ubuntu_20.04 - ubuntu_20.04
- s390x - s390x
variables:
DFLTCC: 0
rules: rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
- if: "$S390X_RUNNER_AVAILABLE" - if: "$S390X_RUNNER_AVAILABLE"
@ -29,8 +27,6 @@ ubuntu-20.04-s390x-all:
tags: tags:
- ubuntu_20.04 - ubuntu_20.04
- s390x - s390x
variables:
DFLTCC: 0
timeout: 75m timeout: 75m
rules: rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
@ -48,8 +44,6 @@ ubuntu-20.04-s390x-alldbg:
tags: tags:
- ubuntu_20.04 - ubuntu_20.04
- s390x - s390x
variables:
DFLTCC: 0
rules: rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
when: manual when: manual
@ -71,8 +65,6 @@ ubuntu-20.04-s390x-clang:
tags: tags:
- ubuntu_20.04 - ubuntu_20.04
- s390x - s390x
variables:
DFLTCC: 0
rules: rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
when: manual when: manual
@ -93,8 +85,6 @@ ubuntu-20.04-s390x-tci:
tags: tags:
- ubuntu_20.04 - ubuntu_20.04
- s390x - s390x
variables:
DFLTCC: 0
rules: rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
when: manual when: manual
@ -114,8 +104,6 @@ ubuntu-20.04-s390x-notcg:
tags: tags:
- ubuntu_20.04 - ubuntu_20.04
- s390x - s390x
variables:
DFLTCC: 0
rules: rules:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
when: manual when: manual

6
.travis.yml
View File

@ -218,7 +218,6 @@ jobs:
- TEST_CMD="make check check-tcg V=1" - TEST_CMD="make check check-tcg V=1"
- CONFIG="--disable-containers --target-list=${MAIN_SOFTMMU_TARGETS},s390x-linux-user" - CONFIG="--disable-containers --target-list=${MAIN_SOFTMMU_TARGETS},s390x-linux-user"
- UNRELIABLE=true - UNRELIABLE=true
- DFLTCC=0
script: script:
- BUILD_RC=0 && make -j${JOBS} || BUILD_RC=$? - BUILD_RC=0 && make -j${JOBS} || BUILD_RC=$?
- | - |
@ -258,7 +257,7 @@ jobs:
env: env:
- CONFIG="--disable-containers --audio-drv-list=sdl --disable-user - CONFIG="--disable-containers --audio-drv-list=sdl --disable-user
--target-list-exclude=${MAIN_SOFTMMU_TARGETS}" --target-list-exclude=${MAIN_SOFTMMU_TARGETS}"
- DFLTCC=0
- name: "[s390x] GCC (user)" - name: "[s390x] GCC (user)"
arch: s390x arch: s390x
dist: focal dist: focal
@ -270,7 +269,7 @@ jobs:
- ninja-build - ninja-build
env: env:
- CONFIG="--disable-containers --disable-system" - CONFIG="--disable-containers --disable-system"
- DFLTCC=0
- name: "[s390x] Clang (disable-tcg)" - name: "[s390x] Clang (disable-tcg)"
arch: s390x arch: s390x
dist: focal dist: focal
@ -304,4 +303,3 @@ jobs:
- CONFIG="--disable-containers --disable-tcg --enable-kvm - CONFIG="--disable-containers --disable-tcg --enable-kvm
--disable-tools --host-cc=clang --cxx=clang++" --disable-tools --host-cc=clang --cxx=clang++"
- UNRELIABLE=true - UNRELIABLE=true
- DFLTCC=0