Update to 6.0.0

This commit is contained in:
Tianon Gravi 2021-04-30 07:54:04 -07:00
parent f252c4de6f
commit 6466cf27a8
6 changed files with 21 additions and 16 deletions

View File

@ -38,8 +38,8 @@ ENV QEMU_KEYS \
# https://www.qemu.org/download/#source
# https://download.qemu.org/?C=M;O=D
ENV QEMU_VERSION 4.2.1
ENV QEMU_URL https://download.qemu.org/qemu-4.2.1.tar.xz
ENV QEMU_VERSION 6.0.0
ENV QEMU_URL https://download.qemu.org/qemu-6.0.0.tar.xz
RUN set -eux; \
\
@ -82,6 +82,9 @@ RUN set -eux; \
python3 \
xfslibs-dev \
zlib1g-dev \
# https://wiki.qemu.org/ChangeLog/5.2#Build_Information
ninja-build \
python3-setuptools \
; \
rm -rf /var/lib/apt/lists/*; \
\

View File

@ -40,8 +40,8 @@ ENV QEMU_KEYS \
# https://www.qemu.org/download/#source
# https://download.qemu.org/?C=M;O=D
ENV QEMU_VERSION 4.2.1
ENV QEMU_URL https://download.qemu.org/qemu-4.2.1.tar.xz
ENV QEMU_VERSION 6.0.0
ENV QEMU_URL https://download.qemu.org/qemu-6.0.0.tar.xz
RUN set -eux; \
\
@ -84,6 +84,9 @@ RUN set -eux; \
python3 \
xfslibs-dev \
zlib1g-dev \
# https://wiki.qemu.org/ChangeLog/5.2#Build_Information
ninja-build \
python3-setuptools \
; \
rm -rf /var/lib/apt/lists/*; \
\

View File

@ -1,11 +1,11 @@
Origin: https://bugs.launchpad.net/qemu/+bug/1217339/comments/2
Origin: https://lists.nongnu.org/archive/html/qemu-devel/2017-03/msg03039.html
diff --git a/vl.c b/vl.c
index 1ad1c04637..9e07fe1dbb 100644
--- a/vl.c
+++ b/vl.c
@@ -1898,7 +1898,11 @@ void qemu_system_killed(int signal, pid_t pid)
diff --git a/softmmu/runstate.c b/softmmu/runstate.c
index ce8977c6a2..392e4c88be 100644
--- a/softmmu/runstate.c
+++ b/softmmu/runstate.c
@@ -613,7 +613,11 @@ void qemu_system_killed(int signal, pid_t pid)
/* Cannot call qemu_system_shutdown_request directly because
* we are in a signal handler.
*/

View File

View File

@ -2,9 +2,8 @@
set -Eeuo pipefail
declare -A aliases=(
[5.3-rc]='rc'
[5.2]='5 latest'
[4.2]='4'
[6.0]='6 latest'
[5.2]='5'
)
self="$(basename "$BASH_SOURCE")"

View File

@ -1,8 +1,4 @@
{
"4.2": {
"url": "https://download.qemu.org/qemu-4.2.1.tar.xz",
"version": "4.2.1"
},
"5.0": {
"url": "https://download.qemu.org/qemu-5.0.1.tar.xz",
"version": "5.0.1"
@ -14,5 +10,9 @@
"5.2": {
"url": "https://download.qemu.org/qemu-5.2.0.tar.xz",
"version": "5.2.0"
},
"6.0": {
"url": "https://download.qemu.org/qemu-6.0.0.tar.xz",
"version": "6.0.0"
}
}