Skip to content

Upgrade qemu to 5.1 #484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Upgrade qemu to 5.1 #484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,37 +261,37 @@ terminate.
|--------------------------------------|-------:|--------:|:---:|------:|:------:|
| `*-apple-ios` [1] | N/A | N/A | N/A | N/A | ✓ |
| `aarch64-linux-android` [2] | N/A | 4.9 | ✓ | N/A | ✓ |
| `aarch64-unknown-linux-gnu` | 2.19 | 4.8.2 | ✓ | 4.1.0 | ✓ |
| `aarch64-unknown-linux-musl` | 1.1.20 | 6.3.0 | | 4.1.0 | ✓ |
| `aarch64-unknown-linux-gnu` | 2.19 | 4.8.2 | ✓ | 5.1.0 | ✓ |
| `aarch64-unknown-linux-musl` | 1.1.20 | 6.3.0 | | 5.1.0 | ✓ |
| `arm-linux-androideabi` [2] | N/A | 4.9 | ✓ | N/A | ✓ |
| `arm-unknown-linux-gnueabi` | 2.19 | 4.8.2 | ✓ | 4.1.0 | ✓ |
| `arm-unknown-linux-gnueabihf` | 2.27 | 7.3.0 | ✓ | 4.1.0 | ✓ |
| `arm-unknown-linux-musleabi` | 1.1.20 | 6.3.0 | | 4.1.0 | ✓ |
| `arm-unknown-linux-musleabihf` | 1.1.20 | 6.3.0 | | 4.1.0 | ✓ |
| `armv5te-unknown-linux-gnueabi` | 2.27 | 7.5.0 | ✓ | 4.2.0 | ✓ |
| `armv5te-unknown-linux-musleabi` | 1.1.20 | 6.3.0 | | 4.1.0 | ✓ |
| `arm-unknown-linux-gnueabi` | 2.19 | 4.8.2 | ✓ | 5.1.0 | ✓ |
| `arm-unknown-linux-gnueabihf` | 2.27 | 7.3.0 | ✓ | 5.1.0 | ✓ |
| `arm-unknown-linux-musleabi` | 1.1.20 | 6.3.0 | | 5.1.0 | ✓ |
| `arm-unknown-linux-musleabihf` | 1.1.20 | 6.3.0 | | 5.1.0 | ✓ |
| `armv5te-unknown-linux-gnueabi` | 2.27 | 7.5.0 | ✓ | 5.1.0 | ✓ |
| `armv5te-unknown-linux-musleabi` | 1.1.20 | 6.3.0 | | 5.1.0 | ✓ |
| `armv7-linux-androideabi` [2] | N/A | 4.9 | ✓ | N/A | ✓ |
| `armv7-unknown-linux-gnueabihf` | 2.15 | 4.6.2 | ✓ | 4.1.0 | ✓ |
| `armv7-unknown-linux-musleabihf` | 1.1.20 | 6.3.0 | | 4.1.0 | ✓ |
| `armv7-unknown-linux-gnueabihf` | 2.15 | 4.6.2 | ✓ | 5.1.0 | ✓ |
| `armv7-unknown-linux-musleabihf` | 1.1.20 | 6.3.0 | | 5.1.0 | ✓ |
| `i586-unknown-linux-gnu` | 2.23 | 5.3.1 | ✓ | N/A | ✓ |
| `i586-unknown-linux-musl` | 1.1.20 | 6.3.0 | | N/A | ✓ |
| `i686-unknown-freebsd` [4] | 12.1 | 6.4.0 | | N/A | ✓ |
| `i686-linux-android` [2] | N/A | 4.9 | ✓ | N/A | ✓ |
| `i686-pc-windows-gnu` | N/A | 7.3.0 | ✓ | N/A | ✓ |
| `i686-unknown-linux-gnu` | 2.15 | 4.6.2 | ✓ | N/A | ✓ |
| `i686-unknown-linux-musl` | 1.1.20 | 6.3.0 | | N/A | ✓ |
| `mips-unknown-linux-gnu` | 2.23 | 5.3.1 | ✓ | 4.1.0 | ✓ |
| `mips-unknown-linux-musl` | 1.1.20 | 6.3.0 | ✓ | 4.1.0 | ✓ |
| `mips64-unknown-linux-gnuabi64` | 2.23 | 5.3.1 | ✓ | 4.1.0 | ✓ |
| `mips64el-unknown-linux-gnuabi64` | 2.23 | 5.3.1 | ✓ | 4.1.0 | ✓ |
| `mipsel-unknown-linux-gnu` | 2.23 | 5.3.1 | ✓ | 4.1.0 | ✓ |
| `mipsel-unknown-linux-musl` | 1.1.20 | 6.3.0 | ✓ | 4.1.0 | ✓ |
| `powerpc-unknown-linux-gnu` | 2.19 | 4.8.2 | ✓ | 3.0.1 | ✓ |
| `powerpc64-unknown-linux-gnu` | 2.31 | 10.2.0 | ✓ | 3.0.1 | ✓ |
| `powerpc64le-unknown-linux-gnu` | 2.19 | 4.8.2 | ✓ | 3.0.1 | ✓ |
| `riscv64gc-unknown-linux-gnu` | 2.27 | 7.5.0 | ✓ | 4.2.0 | ✓ |
| `s390x-unknown-linux-gnu` | 2.23 | 5.3.1 | ✓ | 4.1.0 | |
| `sparc64-unknown-linux-gnu` | 2.31 | 10.2.0 | ✓ | 4.2.0 | ✓ |
| `mips-unknown-linux-gnu` | 2.23 | 5.3.1 | ✓ | 5.1.0 | ✓ |
| `mips-unknown-linux-musl` | 1.1.20 | 6.3.0 | ✓ | 5.1.0 | ✓ |
| `mips64-unknown-linux-gnuabi64` | 2.23 | 5.3.1 | ✓ | 5.1.0 | ✓ |
| `mips64el-unknown-linux-gnuabi64` | 2.23 | 5.3.1 | ✓ | 5.1.0 | ✓ |
| `mipsel-unknown-linux-gnu` | 2.23 | 5.3.1 | ✓ | 5.1.0 | ✓ |
| `mipsel-unknown-linux-musl` | 1.1.20 | 6.3.0 | ✓ | 5.1.0 | ✓ |
| `powerpc-unknown-linux-gnu` | 2.19 | 4.8.2 | ✓ | 5.1.0 | ✓ |
| `powerpc64-unknown-linux-gnu` | 2.31 | 10.2.0 | ✓ | 5.1.0 | ✓ |
| `powerpc64le-unknown-linux-gnu` | 2.19 | 4.8.2 | ✓ | 5.1.0 | ✓ |
| `riscv64gc-unknown-linux-gnu` | 2.27 | 7.5.0 | ✓ | 5.1.0 | ✓ |
| `s390x-unknown-linux-gnu` | 2.23 | 5.3.1 | ✓ | 5.1.0 | |
| `sparc64-unknown-linux-gnu` | 2.31 | 10.2.0 | ✓ | 5.1.0 | ✓ |
| `sparcv9-sun-solaris` [4] | 2.11 | 5.3.0 | ✓ | N/A | |
| `thumbv6m-none-eabi` [5] | 2.2.0 | 5.3.1 | | N/A | |
| `thumbv7em-none-eabi` [5] | 2.2.0 | 5.3.1 | | N/A | |
Expand Down
76 changes: 35 additions & 41 deletions docker/qemu.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,16 +67,7 @@ build_static_pixman() {
}

main() {
local version=4.2.0

# Qemu versions 3.1.0 and above break 32-bit float conversions
# on powerpc, powerpc64, and powerpc64le. Last known working version
# is 3.0.1.
# Upstream Issue:
# https://bugs.launchpad.net/qemu/+bug/1821444
if [[ "${1}" == ppc* ]]; then
version=3.0.1
fi
local version=5.1.0

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

if_centos install_packages \
gcc-c++ \
glib2-devel \
pkgconfig \
zlib-devel \
libcap-devel \
libattr-devel \
pixman-devel \
xz \
libfdt-devel \
glibc-static \
glib2-devel \
glib2-static \
glibc-static \
libattr-devel \
libcap-ng-devel \
libfdt-devel \
pcre-static \
pixman-devel \
zlib-devel \
zlib-static

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

if_ubuntu install_packages \
g++ \
libglib2.0-dev \
pkg-config \
zlib1g-dev \
libcap-dev \
xz-utils \
libattr1-dev \
libcap-ng-dev \
libffi-dev \
libglib2.0-dev \
libpixman-1-dev \
xz-utils
libselinux1-dev \
zlib1g-dev

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

local targets="${arch}-linux-user"
local virtfs=""
case "${softmmu}" in
softmmu)
if [ "${arch}" = "ppc64le" ]; then
targets="${targets},ppc64-softmmu"
else
targets="${targets},${arch}-softmmu"
fi
virtfs="--enable-virtfs"
;;
"")
true
;;
*)
echo "Invalid softmmu option: ${softmmu}"
exit 1
;;
esac
local targets="${arch}-linux-user"
local virtfs=""
case "${softmmu}" in
softmmu)
if [ "${arch}" = "ppc64le" ]; then
targets="${targets},ppc64-softmmu"
else
targets="${targets},${arch}-softmmu"
fi
virtfs="--enable-virtfs"
;;
"")
true
;;
*)
echo "Invalid softmmu option: ${softmmu}"
exit 1
;;
esac

./configure \
--disable-kvm \
--disable-vnc \
--enable-user \
--disable-guest-agent \
--enable-linux-user \
--static \
${virtfs} \
--target-list="${targets}"
Expand Down