Skip to content

Commit be042e6

Browse files
malbarbomalbarbo
committed
Update qemu to 5.1
1 parent 4f213ba commit be042e6

File tree

2 files changed

+57
-63
lines changed

2 files changed

+57
-63
lines changed

‎README.md

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -261,37 +261,37 @@ terminate.
261261
|--------------------------------------|-------:|--------:|:---:|------:|:------:|
262262
| `*-apple-ios` [1] | N/A | N/A | N/A | N/A | ✓ |
263263
| `aarch64-linux-android` [2] | N/A | 4.9 | ✓ | N/A | ✓ |
264-
| `aarch64-unknown-linux-gnu` | 2.19 | 4.8.2 | ✓ | 4.1.0 | ✓ |
265-
| `aarch64-unknown-linux-musl` | 1.1.20 | 6.3.0 | | 4.1.0 | ✓ |
264+
| `aarch64-unknown-linux-gnu` | 2.19 | 4.8.2 | ✓ | 5.1.0 | ✓ |
265+
| `aarch64-unknown-linux-musl` | 1.1.20 | 6.3.0 | | 5.1.0 | ✓ |
266266
| `arm-linux-androideabi` [2] | N/A | 4.9 | ✓ | N/A | ✓ |
267-
| `arm-unknown-linux-gnueabi` | 2.19 | 4.8.2 | ✓ | 4.1.0 | ✓ |
268-
| `arm-unknown-linux-gnueabihf` | 2.27 | 7.3.0 | ✓ | 4.1.0 | ✓ |
269-
| `arm-unknown-linux-musleabi` | 1.1.20 | 6.3.0 | | 4.1.0 | ✓ |
270-
| `arm-unknown-linux-musleabihf` | 1.1.20 | 6.3.0 | | 4.1.0 | ✓ |
271-
| `armv5te-unknown-linux-gnueabi` | 2.27 | 7.5.0 | ✓ | 4.2.0 | ✓ |
272-
| `armv5te-unknown-linux-musleabi` | 1.1.20 | 6.3.0 | | 4.1.0 | ✓ |
267+
| `arm-unknown-linux-gnueabi` | 2.19 | 4.8.2 | ✓ | 5.1.0 | ✓ |
268+
| `arm-unknown-linux-gnueabihf` | 2.27 | 7.3.0 | ✓ | 5.1.0 | ✓ |
269+
| `arm-unknown-linux-musleabi` | 1.1.20 | 6.3.0 | | 5.1.0 | ✓ |
270+
| `arm-unknown-linux-musleabihf` | 1.1.20 | 6.3.0 | | 5.1.0 | ✓ |
271+
| `armv5te-unknown-linux-gnueabi` | 2.27 | 7.5.0 | ✓ | 5.1.0 | ✓ |
272+
| `armv5te-unknown-linux-musleabi` | 1.1.20 | 6.3.0 | | 5.1.0 | ✓ |
273273
| `armv7-linux-androideabi` [2] | N/A | 4.9 | ✓ | N/A | ✓ |
274-
| `armv7-unknown-linux-gnueabihf` | 2.15 | 4.6.2 | ✓ | 4.1.0 | ✓ |
275-
| `armv7-unknown-linux-musleabihf` | 1.1.20 | 6.3.0 | | 4.1.0 | ✓ |
274+
| `armv7-unknown-linux-gnueabihf` | 2.15 | 4.6.2 | ✓ | 5.1.0 | ✓ |
275+
| `armv7-unknown-linux-musleabihf` | 1.1.20 | 6.3.0 | | 5.1.0 | ✓ |
276276
| `i586-unknown-linux-gnu` | 2.23 | 5.3.1 | ✓ | N/A | ✓ |
277277
| `i586-unknown-linux-musl` | 1.1.20 | 6.3.0 | | N/A | ✓ |
278278
| `i686-unknown-freebsd` [4] | 12.1 | 6.4.0 | | N/A | ✓ |
279279
| `i686-linux-android` [2] | N/A | 4.9 | ✓ | N/A | ✓ |
280280
| `i686-pc-windows-gnu` | N/A | 7.3.0 | ✓ | N/A | ✓ |
281281
| `i686-unknown-linux-gnu` | 2.15 | 4.6.2 | ✓ | N/A | ✓ |
282282
| `i686-unknown-linux-musl` | 1.1.20 | 6.3.0 | | N/A | ✓ |
283-
| `mips-unknown-linux-gnu` | 2.23 | 5.3.1 | ✓ | 4.1.0 | ✓ |
284-
| `mips-unknown-linux-musl` | 1.1.20 | 6.3.0 | ✓ | 4.1.0 | ✓ |
285-
| `mips64-unknown-linux-gnuabi64` | 2.23 | 5.3.1 | ✓ | 4.1.0 | ✓ |
286-
| `mips64el-unknown-linux-gnuabi64` | 2.23 | 5.3.1 | ✓ | 4.1.0 | ✓ |
287-
| `mipsel-unknown-linux-gnu` | 2.23 | 5.3.1 | ✓ | 4.1.0 | ✓ |
288-
| `mipsel-unknown-linux-musl` | 1.1.20 | 6.3.0 | ✓ | 4.1.0 | ✓ |
289-
| `powerpc-unknown-linux-gnu` | 2.19 | 4.8.2 | ✓ | 3.0.1 | ✓ |
290-
| `powerpc64-unknown-linux-gnu` | 2.31 | 10.2.0 | ✓ | 3.0.1 | ✓ |
291-
| `powerpc64le-unknown-linux-gnu` | 2.19 | 4.8.2 | ✓ | 3.0.1 | ✓ |
292-
| `riscv64gc-unknown-linux-gnu` | 2.27 | 7.5.0 | ✓ | 4.2.0 | ✓ |
293-
| `s390x-unknown-linux-gnu` | 2.23 | 5.3.1 | ✓ | 4.1.0 | |
294-
| `sparc64-unknown-linux-gnu` | 2.31 | 10.2.0 | ✓ | 4.2.0 | ✓ |
283+
| `mips-unknown-linux-gnu` | 2.23 | 5.3.1 | ✓ | 5.1.0 | ✓ |
284+
| `mips-unknown-linux-musl` | 1.1.20 | 6.3.0 | ✓ | 5.1.0 | ✓ |
285+
| `mips64-unknown-linux-gnuabi64` | 2.23 | 5.3.1 | ✓ | 5.1.0 | ✓ |
286+
| `mips64el-unknown-linux-gnuabi64` | 2.23 | 5.3.1 | ✓ | 5.1.0 | ✓ |
287+
| `mipsel-unknown-linux-gnu` | 2.23 | 5.3.1 | ✓ | 5.1.0 | ✓ |
288+
| `mipsel-unknown-linux-musl` | 1.1.20 | 6.3.0 | ✓ | 5.1.0 | ✓ |
289+
| `powerpc-unknown-linux-gnu` | 2.19 | 4.8.2 | ✓ | 5.1.0 | ✓ |
290+
| `powerpc64-unknown-linux-gnu` | 2.31 | 10.2.0 | ✓ | 5.1.0 | ✓ |
291+
| `powerpc64le-unknown-linux-gnu` | 2.19 | 4.8.2 | ✓ | 5.1.0 | ✓ |
292+
| `riscv64gc-unknown-linux-gnu` | 2.27 | 7.5.0 | ✓ | 5.1.0 | ✓ |
293+
| `s390x-unknown-linux-gnu` | 2.23 | 5.3.1 | ✓ | 5.1.0 | |
294+
| `sparc64-unknown-linux-gnu` | 2.31 | 10.2.0 | ✓ | 5.1.0 | ✓ |
295295
| `sparcv9-sun-solaris` [4] | 2.11 | 5.3.0 | ✓ | N/A | |
296296
| `thumbv6m-none-eabi` [5] | 2.2.0 | 5.3.1 | | N/A | |
297297
| `thumbv7em-none-eabi` [5] | 2.2.0 | 5.3.1 | | N/A | |

‎docker/qemu.sh

Lines changed: 35 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -67,16 +67,7 @@ build_static_pixman() {
6767
}
6868

6969
main() {
70-
local version=4.2.0
71-
72-
# Qemu versions 3.1.0 and above break 32-bit float conversions
73-
# on powerpc, powerpc64, and powerpc64le. Last known working version
74-
# is 3.0.1.
75-
# Upstream Issue:
76-
# https://bugs.launchpad.net/qemu/+bug/1821444
77-
if [[ "${1}" == ppc* ]]; then
78-
version=3.0.1
79-
fi
70+
local version=5.1.0
8071

8172
local arch="${1}" \
8273
softmmu="${2:-}"
@@ -95,17 +86,17 @@ main() {
9586

9687
if_centos install_packages \
9788
gcc-c++ \
98-
glib2-devel \
9989
pkgconfig \
100-
zlib-devel \
101-
libcap-devel \
102-
libattr-devel \
103-
pixman-devel \
10490
xz \
105-
libfdt-devel \
106-
glibc-static \
91+
glib2-devel \
10792
glib2-static \
93+
glibc-static \
94+
libattr-devel \
95+
libcap-ng-devel \
96+
libfdt-devel \
10897
pcre-static \
98+
pixman-devel \
99+
zlib-devel \
109100
zlib-static
110101

111102
# these are not packaged as static libraries in centos; build them manually
@@ -115,13 +106,15 @@ main() {
115106

116107
if_ubuntu install_packages \
117108
g++ \
118-
libglib2.0-dev \
119109
pkg-config \
120-
zlib1g-dev \
121-
libcap-dev \
110+
xz-utils \
122111
libattr1-dev \
112+
libcap-ng-dev \
113+
libffi-dev \
114+
libglib2.0-dev \
123115
libpixman-1-dev \
124-
xz-utils
116+
libselinux1-dev \
117+
zlib1g-dev
125118

126119
local td
127120
td="$(mktemp -d)"
@@ -131,30 +124,31 @@ main() {
131124
curl --retry 3 -sSfL "https://download.qemu.org/qemu-${version}.tar.xz" -O
132125
tar --strip-components=1 -xJf "qemu-${version}.tar.xz"
133126

134-
local targets="${arch}-linux-user"
135-
local virtfs=""
136-
case "${softmmu}" in
137-
softmmu)
138-
if [ "${arch}" = "ppc64le" ]; then
139-
targets="${targets},ppc64-softmmu"
140-
else
141-
targets="${targets},${arch}-softmmu"
142-
fi
143-
virtfs="--enable-virtfs"
144-
;;
145-
"")
146-
true
147-
;;
148-
*)
149-
echo "Invalid softmmu option: ${softmmu}"
150-
exit 1
151-
;;
152-
esac
127+
local targets="${arch}-linux-user"
128+
local virtfs=""
129+
case "${softmmu}" in
130+
softmmu)
131+
if [ "${arch}" = "ppc64le" ]; then
132+
targets="${targets},ppc64-softmmu"
133+
else
134+
targets="${targets},${arch}-softmmu"
135+
fi
136+
virtfs="--enable-virtfs"
137+
;;
138+
"")
139+
true
140+
;;
141+
*)
142+
echo "Invalid softmmu option: ${softmmu}"
143+
exit 1
144+
;;
145+
esac
153146

154147
./configure \
155148
--disable-kvm \
156149
--disable-vnc \
157-
--enable-user \
150+
--disable-guest-agent \
151+
--enable-linux-user \
158152
--static \
159153
${virtfs} \
160154
--target-list="${targets}"

0 commit comments

Comments
 (0)