Skip to content
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

qemu: update to 9.2.0 #25658

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

qemu: update to 9.2.0 #25658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0304a80
qemu: update to 9.2.0
vooon Jan 2, 2025
8180bc4
qemu: replace --disable-sanitizers with individual flags
vooon Jan 2, 2025
106f048
qemu: meson still wants to check for sanitizers
vooon Jan 2, 2025
4393755
qemu: revert no-tests patch
vooon Jan 2, 2025
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
12 changes: 8 additions & 4 deletions utils/qemu/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=qemu
PKG_VERSION:=9.1.0
PKG_RELEASE:=4
PKG_VERSION:=9.2.0
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_HASH:=816b7022a8ba7c2ac30e2e0cf973e826f6bcc8505339603212c5ede8e94d7834
PKG_HASH:=f859f0bc65e1f533d040bbe8c92bcfecee5af2c921a6687c652fb44d089bd894
PKG_SOURCE_URL:=https://download.qemu.org/
PKG_LICENSE:=GPL-2.0-only
PKG_LICENSE_FILES:=LICENSE tcg/LICENSE
Expand Down Expand Up @@ -419,7 +419,11 @@ CONFIGURE_ARGS += \
--disable-rbd \
--disable-rdma \
--disable-rutabaga-gfx \
--disable-sanitizers \
--disable-asan \
--disable-tsan \
--disable-ubsan \
--disable-fuzzing \
--disable-safe-stack \
--$(if $(CONFIG_QEMU_SECCOMP),enable,disable)-seccomp \
--disable-smartcard \
--disable-snappy \
Expand Down
4 changes: 2 additions & 2 deletions utils/qemu/patches/0001-configure-allow-disable-fortify_source.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ OpenWrt base build system decide flavor of fortify_source to use

--- a/configure
+++ b/configure
@@ -757,6 +757,8 @@ for opt do
@@ -799,6 +799,8 @@ for opt do
;;
--gdb=*) gdb_bin="$optarg"
--disable-rust) rust=disabled
;;
+ --disable-fortify-source) fortify_source="no"
+ ;;
Expand Down
6 changes: 3 additions & 3 deletions utils/qemu/patches/0007-qga-invoke-separate-applets-for-guest-shutdown-modes.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ https://gitlab.alpinelinux.org/alpine/aports/commit/76b81b486480fd9c3294cd420bcf

--- a/qga/commands-posix.c
+++ b/qga/commands-posix.c
@@ -217,6 +217,7 @@ out:
@@ -216,6 +216,7 @@ out:
void qmp_guest_shutdown(const char *mode, Error **errp)
{
const char *shutdown_flag;
+ const char *fallback_cmd = NULL;
Error *local_err = NULL;

#ifdef CONFIG_SOLARIS
@@ -236,10 +237,13 @@ void qmp_guest_shutdown(const char *mode
@@ -235,10 +236,13 @@ void qmp_guest_shutdown(const char *mode
slog("guest-shutdown called, mode: %s", mode);
if (!mode || strcmp(mode, "powerdown") == 0) {
shutdown_flag = powerdown_flag;
Expand All @@ -35,7 +35,7 @@ https://gitlab.alpinelinux.org/alpine/aports/commit/76b81b486480fd9c3294cd420bcf
} else {
error_setg(errp,
"mode is invalid (valid values are: halt|powerdown|reboot");
@@ -258,8 +262,12 @@ void qmp_guest_shutdown(const char *mode
@@ -257,8 +261,12 @@ void qmp_guest_shutdown(const char *mode

ga_run_command(argv, NULL, "shutdown", &local_err);
if (local_err) {
Expand Down
4 changes: 2 additions & 2 deletions utils/qemu/patches/0010-no-tests.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/meson.build
+++ b/meson.build
@@ -3630,10 +3630,6 @@ subdir('common-user')
@@ -3794,10 +3794,6 @@ subdir('common-user')
subdir('bsd-user')
subdir('linux-user')

Expand All @@ -11,7 +11,7 @@
# accel modules
tcg_real_module_ss = ss.source_set()
tcg_real_module_ss.add_all(when: 'CONFIG_TCG_MODULAR', if_true: tcg_module_ss)
@@ -4161,10 +4157,6 @@ subdir('scripts')
@@ -4421,10 +4417,6 @@ subdir('scripts')
subdir('tools')
subdir('pc-bios')
subdir('docs')
Expand Down
Loading