Skip to content

Commit f19cd24

Browse files
taylorsimpsontaylorsimpson
committed
Pull from latest qemu.org repo
1 parent 901926b commit f19cd24

File tree

4,508 files changed

+477527
-143709
lines changed

Some content is hidden

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

4,508 files changed

+477527
-143709
lines changed

‎.cirrus.yml

Lines changed: 108 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,40 +3,133 @@ env:
33

44
freebsd_12_task:
55
freebsd_instance:
6-
image: freebsd-12-0-release-amd64
6+
image_family: freebsd-12-1
77
cpu: 8
88
memory: 8G
9-
install_script: pkg install -y
10-
bash bison curl cyrus-sasl git glib gmake gnutls gsed
11-
nettle perl5 pixman pkgconf png usbredir
9+
install_script:
10+
- ASSUME_ALWAYS_YES=yes pkg bootstrap -f ;
11+
- pkg install -y bash curl cyrus-sasl git glib gmake gnutls gsed
12+
nettle perl5 pixman pkgconf png usbredir ninja
1213
script:
1314
- mkdir build
1415
- cd build
15-
- ../configure || { cat config.log; exit 1; }
16-
- gmake -j8
17-
- gmake -j8 V=1 check
16+
- ../configure --enable-werror || { cat config.log meson-logs/meson-log.txt; exit 1; }
17+
- gmake -j$(sysctl -n hw.ncpu)
18+
- gmake -j$(sysctl -n hw.ncpu) check V=1
1819

1920
macos_task:
21+
timeout_in: 90m
2022
osx_instance:
21-
image: mojave-base
23+
image: catalina-base
2224
install_script:
23-
- brew install pkg-config python gnu-sed glib pixman make sdl2
25+
- brew install pkg-config python gnu-sed glib pixman make sdl2 bash ninja
2426
script:
2527
- mkdir build
2628
- cd build
27-
- ../configure --python=/usr/local/bin/python3 || { cat config.log; exit 1; }
29+
- ../configure --python=/usr/local/bin/python3 --enable-werror
30+
--extra-cflags='-Wno-error=deprecated-declarations'
31+
|| { cat config.log meson-logs/meson-log.txt; exit 1; }
2832
- gmake -j$(sysctl -n hw.ncpu)
29-
- gmake check -j$(sysctl -n hw.ncpu)
33+
- gmake check V=1
3034

3135
macos_xcode_task:
36+
timeout_in: 90m
3237
osx_instance:
3338
# this is an alias for the latest Xcode
34-
image: mojave-xcode
39+
image: catalina-xcode
3540
install_script:
36-
- brew install pkg-config gnu-sed glib pixman make sdl2
41+
- brew install pkg-config gnu-sed glib pixman make sdl2 bash ninja
3742
script:
3843
- mkdir build
3944
- cd build
40-
- ../configure --cc=clang || { cat config.log; exit 1; }
45+
- ../configure --extra-cflags='-Wno-error=deprecated-declarations' --enable-modules
46+
--enable-werror --cc=clang || { cat config.log meson-logs/meson-log.txt; exit 1; }
4147
- gmake -j$(sysctl -n hw.ncpu)
42-
- gmake check -j$(sysctl -n hw.ncpu)
48+
- gmake check V=1
49+
50+
windows_msys2_task:
51+
timeout_in: 90m
52+
windows_container:
53+
image: cirrusci/windowsservercore:2019
54+
os_version: 2019
55+
cpu: 8
56+
memory: 8G
57+
env:
58+
CIRRUS_SHELL: powershell
59+
MSYS: winsymlinks:nativestrict
60+
MSYSTEM: MINGW64
61+
CHERE_INVOKING: 1
62+
setup_script:
63+
- choco install -y --no-progress 7zip
64+
- Write-Output $env:PATH
65+
msys2_cache:
66+
folder: C:\tools\archive
67+
reupload_on_changes: false
68+
fingerprint_script: cat .cirrus.yml
69+
populate_script:
70+
- |
71+
md C:\tools
72+
md C:\tools\archive
73+
$start_time = Get-Date
74+
cd C:\tools
75+
bitsadmin /transfer msys_download /dynamic /download /priority FOREGROUND https://github.com/msys2/msys2-installer/releases/download/2020-09-03/msys2-base-x86_64-20200903.sfx.exe C:\tools\base.exe
76+
Write-Output "Download time taken: $((Get-Date).Subtract($start_time).Seconds) second(s)"
77+
C:\tools\base.exe -y
78+
((Get-Content -path C:\tools\msys64\etc\\post-install\\07-pacman-key.post -Raw) -replace '--refresh-keys', '--version') | Set-Content -Path C:\tools\msys64\etc\\post-install\\07-pacman-key.post
79+
C:\tools\msys64\usr\bin\bash.exe -lc "sed -i 's/^CheckSpace/#CheckSpace/g' /etc/pacman.conf"
80+
C:\tools\msys64\usr\bin\bash.exe -lc "export"
81+
C:\tools\msys64\usr\bin\pacman.exe --noconfirm -Sy
82+
echo Y | C:\tools\msys64\usr\bin\pacman.exe --noconfirm -Suu --overwrite=*
83+
taskkill /F /FI "MODULES eq msys-2.0.dll"
84+
tasklist
85+
C:\tools\msys64\usr\bin\bash.exe -lc "mv -f /etc/pacman.conf.pacnew /etc/pacman.conf || true"
86+
C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -Suu --overwrite=*"
87+
C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -S --needed \
88+
diffutils git grep make pkg-config sed \
89+
mingw-w64-x86_64-python \
90+
mingw-w64-x86_64-toolchain \
91+
mingw-w64-x86_64-SDL2 \
92+
mingw-w64-x86_64-SDL2_image \
93+
mingw-w64-x86_64-gtk3 \
94+
mingw-w64-x86_64-glib2 \
95+
mingw-w64-x86_64-ninja \
96+
mingw-w64-x86_64-jemalloc \
97+
mingw-w64-x86_64-lzo2 \
98+
mingw-w64-x86_64-zstd \
99+
mingw-w64-x86_64-libjpeg-turbo \
100+
mingw-w64-x86_64-pixman \
101+
mingw-w64-x86_64-libgcrypt \
102+
mingw-w64-x86_64-libpng \
103+
mingw-w64-x86_64-libssh \
104+
mingw-w64-x86_64-libxml2 \
105+
mingw-w64-x86_64-snappy \
106+
mingw-w64-x86_64-libusb \
107+
mingw-w64-x86_64-usbredir \
108+
mingw-w64-x86_64-libtasn1 \
109+
mingw-w64-x86_64-nettle \
110+
mingw-w64-x86_64-cyrus-sasl \
111+
mingw-w64-x86_64-curl \
112+
mingw-w64-x86_64-gnutls \
113+
mingw-w64-x86_64-libnfs \
114+
"
115+
bitsadmin /transfer msys_download /dynamic /download /priority FOREGROUND `
116+
https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-sphinx-2.3.1-1-any.pkg.tar.xz `
117+
C:\tools\mingw-w64-x86_64-python-sphinx-2.3.1-1-any.pkg.tar.xz
118+
C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -U /c/tools/mingw-w64-x86_64-python-sphinx-2.3.1-1-any.pkg.tar.xz"
119+
del C:\tools\mingw-w64-x86_64-python-sphinx-2.3.1-1-any.pkg.tar.xz
120+
C:\tools\msys64\usr\bin\bash.exe -lc "rm -rf /var/cache/pacman/pkg/*"
121+
cd C:\tools\msys64
122+
echo "Start archive"
123+
cmd /C "7z a -ttar . -so | 7z a -txz -simsys2-x86_64.tar C:\tools\archive\msys2-x86_64.tar.xz"
124+
install_script:
125+
- |
126+
cd C:\tools
127+
cmd /C "7z x C:\tools\archive\msys2-x86_64.tar.xz -so | 7z x -aoa -simsys2-x86_64.tar -ttar -omsys64"
128+
C:\tools\msys64\usr\bin\bash.exe -lc "export"
129+
130+
script:
131+
- C:\tools\msys64\usr\bin\bash.exe -lc "mkdir build"
132+
- C:\tools\msys64\usr\bin\bash.exe -lc "cd build && ../configure --python=python3"
133+
- C:\tools\msys64\usr\bin\bash.exe -lc "cd build && make -j8"
134+
test_script:
135+
- C:\tools\msys64\usr\bin\bash.exe -lc "cd build && make V=1 check"

‎.editorconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,10 @@ indent_style = tab
2222
indent_size = 8
2323
file_type_emacs = makefile
2424

25-
[*.{c,h}]
25+
[*.{c,h,c.inc,h.inc}]
2626
indent_style = space
2727
indent_size = 4
28+
file_type_emacs = c
2829

2930
[*.sh]
3031
indent_style = space

‎.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*.c.inc diff=c
2+
*.h.inc diff=c

‎.gitignore

Lines changed: 2 additions & 155 deletions
Original file line numberDiff line numberDiff line change
@@ -1,165 +1,12 @@
1-
/.doctrees
2-
/config-devices.*
3-
/config-all-devices.*
4-
/config-all-disas.*
5-
/config-host.*
6-
/config-target.*
7-
/config.status
8-
/config-temp
9-
/tools/virtiofsd/50-qemu-virtiofsd.json
10-
/elf2dmp
11-
/trace-events-all
12-
/trace/generated-events.h
13-
/trace/generated-events.c
14-
/trace/generated-helpers-wrappers.h
15-
/trace/generated-helpers.h
16-
/trace/generated-helpers.c
17-
/trace/generated-tcg-tracers.h
18-
/ui/shader/texture-blit-frag.h
19-
/ui/shader/texture-blit-vert.h
20-
/ui/shader/texture-blit-flip-vert.h
21-
/ui/input-keymap-*.c
22-
*-timestamp
23-
/*-softmmu
24-
/*-darwin-user
25-
/*-linux-user
26-
/*-bsd-user
27-
/ivshmem-client
28-
/ivshmem-server
29-
/libdis*
30-
/libuser
31-
/linux-headers/asm
32-
/qga/qapi-generated
33-
/qapi-gen-timestamp
34-
/qapi/qapi-builtin-types.[ch]
35-
/qapi/qapi-builtin-visit.[ch]
36-
/qapi/qapi-commands-*.[ch]
37-
/qapi/qapi-commands.[ch]
38-
/qapi/qapi-emit-events.[ch]
39-
/qapi/qapi-events-*.[ch]
40-
/qapi/qapi-events.[ch]
41-
/qapi/qapi-init-commands.[ch]
42-
/qapi/qapi-introspect.[ch]
43-
/qapi/qapi-types-*.[ch]
44-
/qapi/qapi-types.[ch]
45-
/qapi/qapi-visit-*.[ch]
46-
!/qapi/qapi-visit-core.c
47-
/qapi/qapi-visit.[ch]
48-
/qapi/qapi-doc.texi
49-
/qemu-edid
50-
/qemu-img
51-
/qemu-nbd
52-
/qemu-options.def
53-
/qemu-options.texi
54-
/qemu-img-cmds.texi
55-
/qemu-img-cmds.h
56-
/qemu-io
57-
/qemu-ga
58-
/qemu-bridge-helper
59-
/qemu-keymap
60-
/qemu-monitor.texi
61-
/qemu-monitor-info.texi
62-
/qemu-version.h
63-
/qemu-version.h.tmp
64-
/module_block.h
65-
/scsi/qemu-pr-helper
66-
/vhost-user-scsi
67-
/vhost-user-blk
68-
/vhost-user-gpu
69-
/vhost-user-input
70-
/fsdev/virtfs-proxy-helper
71-
*.tmp
72-
*.[1-9]
73-
*.a
74-
*.aux
75-
*.cp
76-
*.exe
77-
*.msi
78-
*.dll
79-
*.so
80-
*.mo
81-
*.fn
82-
*.ky
83-
*.log
84-
*.pdf
85-
*.pod
86-
*.cps
87-
*.fns
88-
*.kys
89-
*.pg
1+
/GNUmakefile
2+
/build/
903
*.pyc
91-
*.toc
92-
*.tp
93-
*.vr
94-
*.d
95-
!/scripts/qemu-guest-agent/fsfreeze-hook.d
96-
*.o
974
.sdk
98-
*.gcda
99-
*.gcno
100-
*.gcov
101-
/pc-bios/bios-pq/status
102-
/pc-bios/edk2-*.fd
103-
/pc-bios/vgabios-pq/status
104-
/pc-bios/optionrom/linuxboot.asm
105-
/pc-bios/optionrom/linuxboot.bin
106-
/pc-bios/optionrom/linuxboot.raw
107-
/pc-bios/optionrom/linuxboot.img
108-
/pc-bios/optionrom/linuxboot_dma.asm
109-
/pc-bios/optionrom/linuxboot_dma.bin
110-
/pc-bios/optionrom/linuxboot_dma.raw
111-
/pc-bios/optionrom/linuxboot_dma.img
112-
/pc-bios/optionrom/pvh.asm
113-
/pc-bios/optionrom/pvh.bin
114-
/pc-bios/optionrom/pvh.raw
115-
/pc-bios/optionrom/pvh.img
116-
/pc-bios/optionrom/multiboot.asm
117-
/pc-bios/optionrom/multiboot.bin
118-
/pc-bios/optionrom/multiboot.raw
119-
/pc-bios/optionrom/multiboot.img
120-
/pc-bios/optionrom/kvmvapic.asm
121-
/pc-bios/optionrom/kvmvapic.bin
122-
/pc-bios/optionrom/kvmvapic.raw
123-
/pc-bios/optionrom/kvmvapic.img
124-
/pc-bios/s390-ccw/s390-ccw.elf
125-
/pc-bios/s390-ccw/s390-ccw.img
126-
/docs/built
127-
/docs/interop/qemu-ga-qapi.texi
128-
/docs/interop/qemu-ga-ref.html
129-
/docs/interop/qemu-ga-ref.info*
130-
/docs/interop/qemu-ga-ref.txt
131-
/docs/interop/qemu-qmp-qapi.texi
132-
/docs/interop/qemu-qmp-ref.html
133-
/docs/interop/qemu-qmp-ref.info*
134-
/docs/interop/qemu-qmp-ref.txt
135-
/docs/version.texi
136-
/contrib/vhost-user-gpu/50-qemu-gpu.json
137-
*.tps
1385
.stgit-*
1396
.git-submodule-status
1407
cscope.*
1418
tags
1429
TAGS
143-
docker-src.*
14410
*~
14511
*.ast_raw
14612
*.depend_raw
147-
trace.h
148-
trace.c
149-
trace-ust.h
150-
trace-ust.h
151-
trace-dtrace.h
152-
trace-dtrace.dtrace
153-
trace-root.h
154-
trace-root.c
155-
trace-ust-root.h
156-
trace-ust-root.h
157-
trace-ust-all.h
158-
trace-ust-all.c
159-
trace-dtrace-root.h
160-
trace-dtrace-root.dtrace
161-
trace-ust-all.h
162-
trace-ust-all.c
163-
/target/arm/decode-sve.inc.c
164-
build
165-
.vscode

‎.gitlab-ci-edk2.yml

Lines changed: 0 additions & 49 deletions
This file was deleted.

0 commit comments

Comments
 (0)