Skip to content

Commit 7c3c787

Browse files
rmalmainpm215Fabiano Rosasxzpeterhuth
committed
Update to QEMU 9.0.0 (#67)
* Update to QEMU v9.0.0 --------- Signed-off-by: Peter Maydell <[email protected]> Signed-off-by: Fabiano Rosas <[email protected]> Signed-off-by: Peter Xu <[email protected]> Signed-off-by: Thomas Huth <[email protected]> Signed-off-by: Cédric Le Goater <[email protected]> Signed-off-by: Zheyu Ma <[email protected]> Signed-off-by: Ido Plat <[email protected]> Signed-off-by: Ilya Leoshkevich <[email protected]> Signed-off-by: Markus Armbruster <[email protected]> Signed-off-by: Marc-André Lureau <[email protected]> Signed-off-by: Paolo Bonzini <[email protected]> Signed-off-by: Vladimir Sementsov-Ogievskiy <[email protected]> Signed-off-by: David Hildenbrand <[email protected]> Signed-off-by: Kevin Wolf <[email protected]> Signed-off-by: Thomas Lamprecht <[email protected]> Signed-off-by: Fiona Ebner <[email protected]> Signed-off-by: Gregory Price <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]> Signed-off-by: Philippe Mathieu-Daudé <[email protected]> Signed-off-by: Lorenz Brun <[email protected]> Signed-off-by: Yao Xingtao <[email protected]> Signed-off-by: Arnaud Minier <[email protected]> Signed-off-by: Inès Varhol <[email protected]> Signed-off-by: BALATON Zoltan <[email protected]> Signed-off-by: Igor Mammedov <[email protected]> Signed-off-by: Akihiko Odaki <[email protected]> Signed-off-by: Richard Henderson <[email protected]> Signed-off-by: Sven Schnelle <[email protected]> Signed-off-by: Daniel Henrique Barboza <[email protected]> Signed-off-by: Christian Schoenebeck <[email protected]> Signed-off-by: Jason Wang <[email protected]> Signed-off-by: Helge Deller <[email protected]> Signed-off-by: Nicholas Piggin <[email protected]> Signed-off-by: Benjamin Gray <[email protected]> Signed-off-by: Avihai Horon <[email protected]> Signed-off-by: Michael Tokarev <[email protected]> Signed-off-by: Joonas Kankaala <[email protected]> Signed-off-by: Marcin Juszkiewicz <[email protected]> Signed-off-by: Stefan Weil <[email protected]> Signed-off-by: Zhao Liu <[email protected]> Signed-off-by: Glenn Miles <[email protected]> Signed-off-by: Oleg Sviridov <[email protected]> Signed-off-by: Artem Chernyshev <[email protected]> Signed-off-by: Yajun Wu <[email protected]> Signed-off-by: Stefan Hajnoczi <[email protected]> Signed-off-by: Mark Cave-Ayland <[email protected]> Signed-off-by: Pierre-Clément Tosi <[email protected]> Signed-off-by: Lei Wang <[email protected]> Signed-off-by: Wei Wang <[email protected]> Signed-off-by: Martin Hundebøll <[email protected]> Signed-off-by: Michael S. Tsirkin <[email protected]> Signed-off-by: Manos Pitsidianakis <[email protected]> Signed-off-by: Wafer <[email protected]> Signed-off-by: Yuxue Liu <[email protected]> Signed-off-by: Gerd Hoffmann <[email protected]> Signed-off-by: Nguyen Dinh Phi <[email protected]> Signed-off-by: Zack Buhman <[email protected]> Signed-off-by: Keith Packard <[email protected]> Signed-off-by: Yuquan Wang [email protected] Signed-off-by: Matheus Tavares Bernardino <[email protected]> Signed-off-by: Cindy Lu <[email protected]> Co-authored-by: Peter Maydell <[email protected]> Co-authored-by: Fabiano Rosas <[email protected]> Co-authored-by: Peter Xu <[email protected]> Co-authored-by: Thomas Huth <[email protected]> Co-authored-by: Cédric Le Goater <[email protected]> Co-authored-by: Zheyu Ma <[email protected]> Co-authored-by: Ido Plat <[email protected]> Co-authored-by: Ilya Leoshkevich <[email protected]> Co-authored-by: Markus Armbruster <[email protected]> Co-authored-by: Marc-André Lureau <[email protected]> Co-authored-by: Paolo Bonzini <[email protected]> Co-authored-by: Vladimir Sementsov-Ogievskiy <[email protected]> Co-authored-by: David Hildenbrand <[email protected]> Co-authored-by: Kevin Wolf <[email protected]> Co-authored-by: Stefan Reiter <[email protected]> Co-authored-by: Fiona Ebner <[email protected]> Co-authored-by: Gregory Price <[email protected]> Co-authored-by: Lorenz Brun <[email protected]> Co-authored-by: Yao Xingtao <[email protected]> Co-authored-by: Philippe Mathieu-Daudé <[email protected]> Co-authored-by: Arnaud Minier <[email protected]> Co-authored-by: BALATON Zoltan <[email protected]> Co-authored-by: Igor Mammedov <[email protected]> Co-authored-by: Akihiko Odaki <[email protected]> Co-authored-by: Richard Henderson <[email protected]> Co-authored-by: Sven Schnelle <[email protected]> Co-authored-by: Daniel Henrique Barboza <[email protected]> Co-authored-by: Helge Deller <[email protected]> Co-authored-by: Harsh Prateek Bora <[email protected]> Co-authored-by: Benjamin Gray <[email protected]> Co-authored-by: Nicholas Piggin <[email protected]> Co-authored-by: Avihai Horon <[email protected]> Co-authored-by: Michael Tokarev <[email protected]> Co-authored-by: Joonas Kankaala <[email protected]> Co-authored-by: Marcin Juszkiewicz <[email protected]> Co-authored-by: Stefan Weil <[email protected]> Co-authored-by: Dayu Liu <[email protected]> Co-authored-by: Zhao Liu <[email protected]> Co-authored-by: Glenn Miles <[email protected]> Co-authored-by: Artem Chernyshev <[email protected]> Co-authored-by: Yajun Wu <[email protected]> Co-authored-by: Mark Cave-Ayland <[email protected]> Co-authored-by: Pierre-Clément Tosi <[email protected]> Co-authored-by: Wei Wang <[email protected]> Co-authored-by: Martin Hundebøll <[email protected]> Co-authored-by: Michael S. Tsirkin <[email protected]> Co-authored-by: Manos Pitsidianakis <[email protected]> Co-authored-by: Wafer <[email protected]> Co-authored-by: lyx634449800 <[email protected]> Co-authored-by: Gerd Hoffmann <[email protected]> Co-authored-by: Nguyen Dinh Phi <[email protected]> Co-authored-by: Zack Buhman <[email protected]> Co-authored-by: Keith Packard <[email protected]> Co-authored-by: Yuquan Wang <[email protected]> Co-authored-by: Matheus Tavares Bernardino <[email protected]> Co-authored-by: Cindy Lu <[email protected]>
1 parent bf82921 commit 7c3c787

File tree

2,409 files changed

+75142
-38674
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,409 files changed

+75142
-38674
lines changed

.gitlab-ci.d/base.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ variables:
2424
# Each script line from will be in a collapsible section in the job output
2525
# and show the duration of each line.
2626
FF_SCRIPT_SECTIONS: 1
27+
# The project has a fairly fat GIT repo so we try and avoid bringing in things
28+
# we don't need. The --filter options avoid blobs and tree references we aren't going to use
29+
# and we also avoid fetching tags.
30+
GIT_FETCH_EXTRA_FLAGS: --filter=blob:none --filter=tree:0 --no-tags --prune --quiet
2731

2832
interruptible: true
2933

@@ -41,6 +45,10 @@ variables:
4145
- if: '$CI_PROJECT_NAMESPACE == $QEMU_CI_UPSTREAM && $CI_COMMIT_TAG'
4246
when: never
4347

48+
# Scheduled runs on mainline don't get pipelines except for the special Coverity job
49+
- if: '$CI_PROJECT_NAMESPACE == $QEMU_CI_UPSTREAM && $CI_PIPELINE_SOURCE == "schedule"'
50+
when: never
51+
4452
# Cirrus jobs can't run unless the creds / target repo are set
4553
- if: '$QEMU_JOB_CIRRUS && ($CIRRUS_GITHUB_REPO == null || $CIRRUS_API_TOKEN == null)'
4654
when: never

.gitlab-ci.d/buildtest-template.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
- export CCACHE_DIR="$CCACHE_BASEDIR/ccache"
1515
- export CCACHE_MAXSIZE="500M"
1616
- export PATH="$CCACHE_WRAPPERSDIR:$PATH"
17+
- du -sh .git
1718
- mkdir build
1819
- cd build
1920
- ccache --zero-stats

.gitlab-ci.d/buildtest.yml

Lines changed: 110 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ build-system-ubuntu:
4141
variables:
4242
IMAGE: ubuntu2204
4343
CONFIGURE_ARGS: --enable-docs
44-
TARGETS: alpha-softmmu microblaze-softmmu mips64el-softmmu
44+
TARGETS: alpha-softmmu microblazeel-softmmu mips64el-softmmu
4545
MAKE_CHECK_ARGS: check-build
4646

4747
check-system-ubuntu:
@@ -61,7 +61,7 @@ avocado-system-ubuntu:
6161
variables:
6262
IMAGE: ubuntu2204
6363
MAKE_CHECK_ARGS: check-avocado
64-
AVOCADO_TAGS: arch:alpha arch:microblaze arch:mips64el
64+
AVOCADO_TAGS: arch:alpha arch:microblazeel arch:mips64el
6565

6666
build-system-debian:
6767
extends:
@@ -167,6 +167,75 @@ build-system-centos:
167167
x86_64-softmmu rx-softmmu sh4-softmmu nios2-softmmu
168168
MAKE_CHECK_ARGS: check-build
169169

170+
# Previous QEMU release. Used for cross-version migration tests.
171+
build-previous-qemu:
172+
extends: .native_build_job_template
173+
artifacts:
174+
when: on_success
175+
expire_in: 2 days
176+
paths:
177+
- build-previous
178+
exclude:
179+
- build-previous/**/*.p
180+
- build-previous/**/*.a.p
181+
- build-previous/**/*.fa.p
182+
- build-previous/**/*.c.o
183+
- build-previous/**/*.c.o.d
184+
- build-previous/**/*.fa
185+
needs:
186+
job: amd64-opensuse-leap-container
187+
variables:
188+
IMAGE: opensuse-leap
189+
TARGETS: x86_64-softmmu aarch64-softmmu
190+
# Override the default flags as we need more to grab the old version
191+
GIT_FETCH_EXTRA_FLAGS: --prune --quiet
192+
before_script:
193+
- export QEMU_PREV_VERSION="$(sed 's/\([0-9.]*\)\.[0-9]*/v\1.0/' VERSION)"
194+
- git remote add upstream https://gitlab.com/qemu-project/qemu
195+
- git fetch upstream refs/tags/$QEMU_PREV_VERSION:refs/tags/$QEMU_PREV_VERSION
196+
- git checkout $QEMU_PREV_VERSION
197+
after_script:
198+
- mv build build-previous
199+
200+
.migration-compat-common:
201+
extends: .common_test_job_template
202+
needs:
203+
- job: build-previous-qemu
204+
- job: build-system-opensuse
205+
# The old QEMU could have bugs unrelated to migration that are
206+
# already fixed in the current development branch, so this test
207+
# might fail.
208+
allow_failure: true
209+
variables:
210+
IMAGE: opensuse-leap
211+
MAKE_CHECK_ARGS: check-build
212+
script:
213+
# Use the migration-tests from the older QEMU tree. This avoids
214+
# testing an old QEMU against new features/tests that it is not
215+
# compatible with.
216+
- cd build-previous
217+
# old to new
218+
- QTEST_QEMU_BINARY_SRC=./qemu-system-${TARGET}
219+
QTEST_QEMU_BINARY=../build/qemu-system-${TARGET} ./tests/qtest/migration-test
220+
# new to old
221+
- QTEST_QEMU_BINARY_DST=./qemu-system-${TARGET}
222+
QTEST_QEMU_BINARY=../build/qemu-system-${TARGET} ./tests/qtest/migration-test
223+
224+
# This job needs to be disabled until we can have an aarch64 CPU model that
225+
# will both (1) support both KVM and TCG, and (2) provide a stable ABI.
226+
# Currently only "-cpu max" can provide (1), however it doesn't guarantee
227+
# (2). Mark this test skipped until later.
228+
migration-compat-aarch64:
229+
extends: .migration-compat-common
230+
variables:
231+
TARGET: aarch64
232+
QEMU_JOB_SKIPPED: 1
233+
234+
migration-compat-x86_64:
235+
extends: .migration-compat-common
236+
variables:
237+
TARGET: x86_64
238+
170239
check-system-centos:
171240
extends: .native_test_job_template
172241
needs:
@@ -184,7 +253,7 @@ avocado-system-centos:
184253
variables:
185254
IMAGE: centos8
186255
MAKE_CHECK_ARGS: check-avocado
187-
AVOCADO_TAGS: arch:ppc64 arch:or1k arch:390x arch:x86_64 arch:rx
256+
AVOCADO_TAGS: arch:ppc64 arch:or1k arch:s390x arch:x86_64 arch:rx
188257
arch:sh4 arch:nios2
189258

190259
build-system-opensuse:
@@ -592,7 +661,7 @@ build-without-defaults:
592661
--disable-pie
593662
--disable-qom-cast-debug
594663
--disable-strip
595-
TARGETS: avr-softmmu mips64-softmmu s390x-softmmu sh4-softmmu
664+
TARGETS: avr-softmmu s390x-softmmu sh4-softmmu
596665
sparc64-softmmu hexagon-linux-user i386-linux-user s390x-linux-user
597666
MAKE_CHECK_ARGS: check
598667

@@ -662,3 +731,40 @@ pages:
662731
- public
663732
variables:
664733
QEMU_JOB_PUBLISH: 1
734+
735+
coverity:
736+
image: $CI_REGISTRY_IMAGE/qemu/fedora:$QEMU_CI_CONTAINER_TAG
737+
stage: build
738+
allow_failure: true
739+
timeout: 3h
740+
needs:
741+
- job: amd64-fedora-container
742+
optional: true
743+
before_script:
744+
- dnf install -y curl wget
745+
script:
746+
# would be nice to cancel the job if over quota (https://gitlab.com/gitlab-org/gitlab/-/issues/256089)
747+
# for example:
748+
# curl --request POST --header "PRIVATE-TOKEN: $CI_JOB_TOKEN" "${CI_SERVER_URL}/api/v4/projects/${CI_PROJECT_ID}/jobs/${CI_JOB_ID}/cancel
749+
- 'scripts/coverity-scan/run-coverity-scan --check-upload-only || { exitcode=$?; if test $exitcode = 1; then
750+
exit 0;
751+
else
752+
exit $exitcode;
753+
fi; };
754+
scripts/coverity-scan/run-coverity-scan --update-tools-only > update-tools.log 2>&1 || { cat update-tools.log; exit 1; };
755+
scripts/coverity-scan/run-coverity-scan --no-update-tools'
756+
rules:
757+
- if: '$COVERITY_TOKEN == null'
758+
when: never
759+
- if: '$COVERITY_EMAIL == null'
760+
when: never
761+
# Never included on upstream pipelines, except for schedules
762+
- if: '$CI_PROJECT_NAMESPACE == $QEMU_CI_UPSTREAM && $CI_PIPELINE_SOURCE == "schedule"'
763+
when: on_success
764+
- if: '$CI_PROJECT_NAMESPACE == $QEMU_CI_UPSTREAM'
765+
when: never
766+
# Forks don't get any pipeline unless QEMU_CI=1 or QEMU_CI=2 is set
767+
- if: '$QEMU_CI != "1" && $QEMU_CI != "2"'
768+
when: never
769+
# Always manual on forks even if $QEMU_CI == "2"
770+
- when: manual

.gitlab-ci.d/cirrus.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
.cirrus_build_job:
1414
extends: .base_job_template
1515
stage: build
16-
image: registry.gitlab.com/libvirt/libvirt-ci/cirrus-run:master
16+
image: registry.gitlab.com/libvirt/libvirt-ci/cirrus-run:latest
1717
needs: []
1818
# 20 mins larger than "timeout_in" in cirrus/build.yml
1919
# as there's often a 5-10 minute delay before Cirrus CI
@@ -52,7 +52,7 @@ x64-freebsd-13-build:
5252
NAME: freebsd-13
5353
CIRRUS_VM_INSTANCE_TYPE: freebsd_instance
5454
CIRRUS_VM_IMAGE_SELECTOR: image_family
55-
CIRRUS_VM_IMAGE_NAME: freebsd-13-2
55+
CIRRUS_VM_IMAGE_NAME: freebsd-13-3
5656
CIRRUS_VM_CPUS: 8
5757
CIRRUS_VM_RAM: 8G
5858
UPDATE_COMMAND: pkg update; pkg upgrade -y

.gitlab-ci.d/container-cross.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,6 @@ cris-fedora-cross-container:
101101
variables:
102102
NAME: fedora-cris-cross
103103

104-
win32-fedora-cross-container:
105-
extends: .container_job_template
106-
variables:
107-
NAME: fedora-win32-cross
108-
109104
win64-fedora-cross-container:
110105
extends: .container_job_template
111106
variables:

.gitlab-ci.d/crossbuilds.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -159,20 +159,6 @@ cross-mips64el-kvm-only:
159159
IMAGE: debian-mips64el-cross
160160
EXTRA_CONFIGURE_OPTS: --disable-tcg --target-list=mips64el-softmmu
161161

162-
cross-win32-system:
163-
extends: .cross_system_build_job
164-
needs:
165-
job: win32-fedora-cross-container
166-
variables:
167-
IMAGE: fedora-win32-cross
168-
EXTRA_CONFIGURE_OPTS: --enable-fdt=internal
169-
CROSS_SKIP_TARGETS: alpha-softmmu avr-softmmu hppa-softmmu m68k-softmmu
170-
microblazeel-softmmu mips64el-softmmu nios2-softmmu
171-
artifacts:
172-
when: on_success
173-
paths:
174-
- build/qemu-setup*.exe
175-
176162
cross-win64-system:
177163
extends: .cross_system_build_job
178164
needs:

.gitlab-ci.d/custom-runners.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,14 @@
1010
# gitlab-runner. To avoid problems that gitlab-runner can cause while
1111
# reusing the GIT repository, let's enable the clone strategy, which
1212
# guarantees a fresh repository on each job run.
13-
variables:
14-
GIT_STRATEGY: clone
1513

1614
# All custom runners can extend this template to upload the testlog
1715
# data as an artifact and also feed the junit report
1816
.custom_runner_template:
1917
extends: .base_job_template
18+
variables:
19+
GIT_STRATEGY: clone
20+
GIT_FETCH_EXTRA_FLAGS: --no-tags --prune --quiet
2021
artifacts:
2122
name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
2223
expire_in: 7 days

.gitlab-ci.d/opensbi.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@
2424
- if: '$QEMU_CI == "1" && $CI_PROJECT_NAMESPACE != "qemu-project" && $CI_COMMIT_MESSAGE =~ /opensbi/i'
2525
when: manual
2626

27+
# Scheduled runs on mainline don't get pipelines except for the special Coverity job
28+
- if: '$CI_PROJECT_NAMESPACE == $QEMU_CI_UPSTREAM && $CI_PIPELINE_SOURCE == "schedule"'
29+
when: never
30+
2731
# Run if any files affecting the build output are touched
2832
- changes:
2933
- .gitlab-ci.d/opensbi.yml

.gitlab-ci.d/windows.yml

Lines changed: 43 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.shared_msys2_builder:
1+
msys2-64bit:
22
extends: .base_job_template
33
tags:
44
- shared-windows
@@ -14,9 +14,22 @@
1414
stage: build
1515
timeout: 100m
1616
variables:
17+
# Select the "64 bit, gcc and MSVCRT" MSYS2 environment
18+
MSYSTEM: MINGW64
1719
# This feature doesn't (currently) work with PowerShell, it stops
1820
# the echo'ing of commands being run and doesn't show any timing
1921
FF_SCRIPT_SECTIONS: 0
22+
# do not remove "--without-default-devices"!
23+
# commit 9f8e6cad65a6 ("gitlab-ci: Speed up the msys2-64bit job by using --without-default-devices"
24+
# changed to compile QEMU with the --without-default-devices switch
25+
# for this job, because otherwise the build could not complete within
26+
# the project timeout.
27+
CONFIGURE_ARGS: --target-list=x86_64-softmmu --without-default-devices -Ddebug=false -Doptimization=0
28+
# qTests don't run successfully with "--without-default-devices",
29+
# so let's exclude the qtests from CI for now.
30+
TEST_ARGS: --no-suite qtest
31+
# The Windows git is a bit older so override the default
32+
GIT_FETCH_EXTRA_FLAGS: --no-tags --prune --quiet
2033
artifacts:
2134
name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
2235
expire_in: 7 days
@@ -72,33 +85,35 @@
7285
- .\msys64\usr\bin\bash -lc "pacman -Sy --noconfirm --needed
7386
bison diffutils flex
7487
git grep make sed
75-
$MINGW_TARGET-binutils
76-
$MINGW_TARGET-capstone
77-
$MINGW_TARGET-ccache
78-
$MINGW_TARGET-curl
79-
$MINGW_TARGET-cyrus-sasl
80-
$MINGW_TARGET-dtc
81-
$MINGW_TARGET-gcc
82-
$MINGW_TARGET-glib2
83-
$MINGW_TARGET-gnutls
84-
$MINGW_TARGET-gtk3
85-
$MINGW_TARGET-libgcrypt
86-
$MINGW_TARGET-libjpeg-turbo
87-
$MINGW_TARGET-libnfs
88-
$MINGW_TARGET-libpng
89-
$MINGW_TARGET-libssh
90-
$MINGW_TARGET-libtasn1
91-
$MINGW_TARGET-lzo2
92-
$MINGW_TARGET-nettle
93-
$MINGW_TARGET-ninja
94-
$MINGW_TARGET-pixman
95-
$MINGW_TARGET-pkgconf
96-
$MINGW_TARGET-python
97-
$MINGW_TARGET-SDL2
98-
$MINGW_TARGET-SDL2_image
99-
$MINGW_TARGET-snappy
100-
$MINGW_TARGET-zstd
101-
$EXTRA_PACKAGES "
88+
mingw-w64-x86_64-binutils
89+
mingw-w64-x86_64-capstone
90+
mingw-w64-x86_64-ccache
91+
mingw-w64-x86_64-curl
92+
mingw-w64-x86_64-cyrus-sasl
93+
mingw-w64-x86_64-dtc
94+
mingw-w64-x86_64-gcc
95+
mingw-w64-x86_64-glib2
96+
mingw-w64-x86_64-gnutls
97+
mingw-w64-x86_64-gtk3
98+
mingw-w64-x86_64-libgcrypt
99+
mingw-w64-x86_64-libjpeg-turbo
100+
mingw-w64-x86_64-libnfs
101+
mingw-w64-x86_64-libpng
102+
mingw-w64-x86_64-libssh
103+
mingw-w64-x86_64-libtasn1
104+
mingw-w64-x86_64-libusb
105+
mingw-w64-x86_64-lzo2
106+
mingw-w64-x86_64-nettle
107+
mingw-w64-x86_64-ninja
108+
mingw-w64-x86_64-pixman
109+
mingw-w64-x86_64-pkgconf
110+
mingw-w64-x86_64-python
111+
mingw-w64-x86_64-SDL2
112+
mingw-w64-x86_64-SDL2_image
113+
mingw-w64-x86_64-snappy
114+
mingw-w64-x86_64-spice
115+
mingw-w64-x86_64-usbredir
116+
mingw-w64-x86_64-zstd"
102117
- Write-Output "Running build at $(Get-Date -Format u)"
103118
- $env:CHERE_INVOKING = 'yes' # Preserve the current working directory
104119
- $env:MSYS = 'winsymlinks:native' # Enable native Windows symlink
@@ -115,19 +130,3 @@
115130
- ..\msys64\usr\bin\bash -lc "make check MTESTARGS='$TEST_ARGS' || { cat meson-logs/testlog.txt; exit 1; } ;"
116131
- ..\msys64\usr\bin\bash -lc "ccache --show-stats"
117132
- Write-Output "Finished build at $(Get-Date -Format u)"
118-
119-
msys2-64bit:
120-
extends: .shared_msys2_builder
121-
variables:
122-
MINGW_TARGET: mingw-w64-x86_64
123-
MSYSTEM: MINGW64
124-
# msys2 only ship these packages for 64-bit, not 32-bit
125-
EXTRA_PACKAGES: $MINGW_TARGET-libusb $MINGW_TARGET-usbredir $MINGW_TARGET-spice
126-
# do not remove "--without-default-devices"!
127-
# commit 9f8e6cad65a6 ("gitlab-ci: Speed up the msys2-64bit job by using --without-default-devices"
128-
# changed to compile QEMU with the --without-default-devices switch
129-
# for the msys2 64-bit job, due to the build could not complete within
130-
CONFIGURE_ARGS: --target-list=x86_64-softmmu --without-default-devices -Ddebug=false -Doptimization=0
131-
# qTests don't run successfully with "--without-default-devices",
132-
# so let's exclude the qtests from CI for now.
133-
TEST_ARGS: --no-suite qtest

0 commit comments

Comments
 (0)