Browse Source

package/qemu: bump to version 10.0.0

Changes log:
https://wiki.qemu.org/ChangeLog/10.0

Remove upstream patches:

- 0002-stubs-only-build-stubs-for-QAPI-events-when-needed.patch
  https://gitlab.com/qemu-project/qemu/-/commit/8113dbbcdaee05f319a7e48272416d918cb2b04a
- 0003-sched_attr-Do-not-define-for-glibc-2.41.patch
  https://gitlab.com/qemu-project/qemu/-/commit/27a8d899c7a100fd5aa040a8b993bb257687c393

Note:
  32-bit host support is now deprecated for all platforms and will be
  removed in a future QEMU release.
  https://gitlab.com/qemu-project/qemu/-/commit/6d701c9bac1d3571e9ad511e01b27df7237f0b13

Qemu defconfigs were runtime tested on Gitlab-CI:
https://gitlab.com/kubu93/buildroot/-/pipelines/1805672685

qemu_s390x_defconfig, qemu_arm_vexpress_tz_defconfig,
qemu_aarch64_ebbr_defconfig were tested locally.

Runtime tests using host-qemu were locally tested:
TestXvisor, TestFwts, TestEdk2, TestGrubAArch64EFI.

Signed-off-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Julien Olivain <ju.o@free.fr>
Romain Naour 2 months ago
parent
commit
dd2d62a36e

+ 0 - 45
package/qemu/0002-stubs-only-build-stubs-for-QAPI-events-when-needed.patch

@@ -1,45 +0,0 @@
-From ffd5e7cbc0cf2d1c0984bb453cc9e125c7259436 Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@smile.fr>
-Date: Tue, 7 Jan 2025 21:52:51 +0100
-Subject: [PATCH] stubs: only build stubs for QAPI events when needed
-
-Since commit "stubs: avoid duplicate symbols in libqemuutil.a" [1],
-Qemu doesn't build with:
-
-  ./configure --enable-user --disable-system --enable-tools
-
-  /usr/bin/ld: libhwcore.a.p/hw_core_qdev.c.o: in function 'device_finalize':
-  [...]output/build/host-qemu-9.2.0/build/../hw/core/qdev.c:689:(.text+0x75c): undefined reference to 'qapi_event_send_device_deleted'
-  collect2: error: ld returned 1 exit status
-
-Indeed, with have_system = false and have_tools = true, Qemu needs the
-stubs for QAPI events added by stub_ss.add(files('qdev.c')) to provide
-qapi_event_send_device_deleted().
-
-Fixes: 388b849fb6c33882b481123568995a749a54f648.
-
-[1] https://gitlab.com/qemu-project/qemu/-/commit/388b849fb6c33882b481123568995a749a54f648
-
-Upstream: https://gitlab.com/qemu-project/qemu/-/issues/2766
-
-Signed-off-by: Romain Naour <romain.naour@smile.fr>
----
- stubs/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/stubs/meson.build b/stubs/meson.build
-index e91614a874..838a8ca3e3 100644
---- a/stubs/meson.build
-+++ b/stubs/meson.build
-@@ -58,7 +58,7 @@ if have_user
- 
-   # Stubs for QAPI events.  Those can always be included in the build, but
-   # they are not built at all for --disable-system --disable-tools builds.
--  if not (have_system or have_tools)
-+  if not have_system and have_tools
-     stub_ss.add(files('qdev.c'))
-   endif
- endif
--- 
-2.47.1
-

+ 0 - 49
package/qemu/0003-sched_attr-Do-not-define-for-glibc-2.41.patch

@@ -1,49 +0,0 @@
-From 66b1926d72ef51d4d59d0f97061f26a75651e265 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 11 Oct 2024 12:31:40 -0700
-Subject: [PATCH] sched_attr: Do not define for glibc >= 2.41
-
-glibc 2.41+ has added [1] definitions for sched_setattr and sched_getattr functions
-and struct sched_attr. Therefore, it needs to be checked for here as well before
-defining sched_attr
-
-Define sched_attr conditionally on SCHED_ATTR_SIZE_VER0
-
-Fixes builds with glibc/trunk
-
-[1] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=21571ca0d70302909cf72707b2a7736cf12190a0;hp=298bc488fdc047da37482f4003023cb9adef78f8
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Cc: Laurent Vivier <laurent@vivier.eu>
-Cc: Paolo Bonzini <pbonzini@redhat.com>
-Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
-Upstream: https://patchwork.kernel.org/project/qemu-devel/patch/20241011193140.1047648-1-raj.khem@gmail.com/
----
- linux-user/syscall.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 1ce4c79784..a407d4a023 100644
---- a/linux-user/syscall.c
-+++ b/linux-user/syscall.c
-@@ -358,7 +358,8 @@ _syscall3(int, sys_sched_getaffinity, pid_t, pid, unsigned int, len,
- #define __NR_sys_sched_setaffinity __NR_sched_setaffinity
- _syscall3(int, sys_sched_setaffinity, pid_t, pid, unsigned int, len,
-           unsigned long *, user_mask_ptr);
--/* sched_attr is not defined in glibc */
-+/* sched_attr is not defined in glibc < 2.41 */
-+#ifndef SCHED_ATTR_SIZE_VER0
- struct sched_attr {
-     uint32_t size;
-     uint32_t sched_policy;
-@@ -371,6 +372,7 @@ struct sched_attr {
-     uint32_t sched_util_min;
-     uint32_t sched_util_max;
- };
-+#endif
- #define __NR_sys_sched_getattr __NR_sched_getattr
- _syscall4(int, sys_sched_getattr, pid_t, pid, struct sched_attr *, attr,
-           unsigned int, size, unsigned int, flags);
--- 
-2.34.1
-

+ 1 - 1
package/qemu/qemu.hash

@@ -1,4 +1,4 @@
 # Locally computed, tarball verified with GPG signature
 # Locally computed, tarball verified with GPG signature
-sha256  f859f0bc65e1f533d040bbe8c92bcfecee5af2c921a6687c652fb44d089bd894  qemu-9.2.0.tar.xz
+sha256  22c075601fdcf8c7b2671a839ebdcef1d4f2973eb6735254fd2e1bd0f30b3896  qemu-10.0.0.tar.xz
 sha256  6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100  COPYING
 sha256  6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100  COPYING
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LIB
 sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LIB

+ 1 - 1
package/qemu/qemu.mk

@@ -6,7 +6,7 @@
 
 
 # When updating the version, check whether the list of supported targets
 # When updating the version, check whether the list of supported targets
 # needs to be updated.
 # needs to be updated.
-QEMU_VERSION = 9.2.0
+QEMU_VERSION = 10.0.0
 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz
 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz
 QEMU_SITE = https://download.qemu.org
 QEMU_SITE = https://download.qemu.org
 QEMU_SELINUX_MODULES = qemu virt
 QEMU_SELINUX_MODULES = qemu virt