diff --git a/meta/recipes-devtools/qemu/qemu-native_11.0.3.bb b/meta/recipes-devtools/qemu/qemu-native_11.1.0.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu-native_11.0.3.bb rename to meta/recipes-devtools/qemu/qemu-native_11.1.0.bb diff --git a/meta/recipes-devtools/qemu/qemu-system-native_11.0.3.bb b/meta/recipes-devtools/qemu/qemu-system-native_11.1.0.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu-system-native_11.0.3.bb rename to meta/recipes-devtools/qemu/qemu-system-native_11.1.0.bb diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index b28f4002ee..a60050125b 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -32,8 +32,6 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0008-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch \ file://0010-configure-lookup-meson-exutable-from-PATH.patch \ file://0011-qemu-Ensure-pip-and-the-python-venv-aren-t-used-for-.patch \ - file://0012-meson-fix-close_range-detection-on-older-glibc.patch \ - file://0013-hw-scsi-vhost-scsi-include-standard-headers-for-vhost-worker-structs.patch \ file://qemu-guest-agent.init \ file://qemu-guest-agent.udev \ file://0001-ui-sdl2.c-force-disable-SDL_HINT_VIDEO_X11_FORCE_EGL.patch \ @@ -42,7 +40,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ UPSTREAM_CHECK_URI = "https://www.qemu.org" UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" -SRC_URI[sha256sum] = "da5fcffc32762820568b828ed430a728864d34d50b6d2f30358597760cbb0523" +SRC_URI[sha256sum] = "6ee1d1a61f68212476b27108c26da5f449dc09b626d42f8279ba0dc2e08fa858" CVE_STATUS[CVE-2007-0998] = "not-applicable-config: The VNC server can expose host files uder some circumstances. We don't enable it by default." @@ -213,7 +211,6 @@ PACKAGECONFIG[spice] = "--enable-spice,--disable-spice,spice" PACKAGECONFIG[dbus-display] = "--enable-dbus-display,--disable-dbus-display,glib-2.0-native,dbus" PACKAGECONFIG[usb-redir] = "--enable-usb-redir,--disable-usb-redir,usbredir" PACKAGECONFIG[snappy] = "--enable-snappy,--disable-snappy,snappy" -PACKAGECONFIG[glusterfs] = "--enable-glusterfs,--disable-glusterfs,glusterfs" PACKAGECONFIG[xkbcommon] = "--enable-xkbcommon,--disable-xkbcommon,libxkbcommon" PACKAGECONFIG[libudev] = "--enable-libudev,--disable-libudev,udev" PACKAGECONFIG[attr] = "--enable-attr,--disable-attr,attr," diff --git a/meta/recipes-devtools/qemu/qemu/0007-tests-meson.build-use-relative-path-to-refer-to-file.patch b/meta/recipes-devtools/qemu/qemu/0007-tests-meson.build-use-relative-path-to-refer-to-file.patch index 61d7924969..7af7876920 100644 --- a/meta/recipes-devtools/qemu/qemu/0007-tests-meson.build-use-relative-path-to-refer-to-file.patch +++ b/meta/recipes-devtools/qemu/qemu/0007-tests-meson.build-use-relative-path-to-refer-to-file.patch @@ -1,4 +1,4 @@ -From 3d7bf86f69b5ff80dbe54dc2b3bd3dba0971e0ac Mon Sep 17 00:00:00 2001 +From 8342d13939436afab61bf231574e116686484d1c Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Thu, 14 Jan 2021 06:33:04 +0000 Subject: [PATCH] tests/meson.build: use relative path to refer to files @@ -12,15 +12,19 @@ filename too long. Fixed by using relative path to refer to files Upstream-Status: Submitted [send to qemu-devel] Signed-off-by: Changqing Li + +Refresh to apply on v11.1.0. + +Signed-off-by: Trevor Gamblin --- tests/unit/meson.build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/unit/meson.build b/tests/unit/meson.build -index f768e882a..9c7931a87 100644 +index dc3fb954c0..914845b221 100644 --- a/tests/unit/meson.build +++ b/tests/unit/meson.build -@@ -125,17 +125,17 @@ endif +@@ -127,17 +127,17 @@ endif if have_system tests += { @@ -39,5 +43,8 @@ index f768e882a..9c7931a87 100644 - 'test-smp-parse': [qom, meson.project_source_root() / 'hw/core/machine-smp.c'], + 'test-smp-parse': [qom, '../../hw/core/machine-smp.c'], 'test-vmstate': [migration, io], - 'test-yank': ['socket-helpers.c', qom, io, chardev] - } + 'test-yank': ['socket-helpers.c', qom, io, chardev], + 'test-ram-discard-manager': [ +-- +2.55.0 + diff --git a/meta/recipes-devtools/qemu/qemu/0012-meson-fix-close_range-detection-on-older-glibc.patch b/meta/recipes-devtools/qemu/qemu/0012-meson-fix-close_range-detection-on-older-glibc.patch deleted file mode 100644 index ccef853c3b..0000000000 --- a/meta/recipes-devtools/qemu/qemu/0012-meson-fix-close_range-detection-on-older-glibc.patch +++ /dev/null @@ -1,39 +0,0 @@ -From b2b9a9e38f20fb8aa6ed26a3c38962651e3a9eae Mon Sep 17 00:00:00 2001 -From: Quan Sun -Date: Fri, 5 Jun 2026 11:54:57 +0000 -Subject: [PATCH] meson: fix close_range detection on older glibc - -The has_function('close_range') check succeeds at link time on hosts -with kernel >= 5.9 even when glibc does not declare the function -(glibc < 2.34, e.g. AlmaLinux 8 / CentOS 8 with glibc 2.28). This -causes CONFIG_CLOSE_RANGE to be set, but compilation then fails with: - - error: implicit declaration of function 'close_range' [-Wimplicit-function-declaration] - -Fix by adding a prefix that includes , so the meson check -only succeeds when the C library actually declares close_range() in -its headers. When the check fails, the existing fallback path in -oslib-posix.c (which returns false and falls through to the /proc -based fd closing) is used instead. - -Upstream-Status: Submitted [https://lore.kernel.org/qemu-devel/20260522201850.1342167-1-Quan.Sun@windriver.com/] - -Signed-off-by: Quan Sun ---- - meson.build | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 51f5f2851..4353200db 100644 ---- a/meson.build -+++ b/meson.build -@@ -2637,7 +2637,8 @@ if host_os == 'windows' - endif - - # has_function --config_host_data.set('CONFIG_CLOSE_RANGE', cc.has_function('close_range')) -+config_host_data.set('CONFIG_CLOSE_RANGE', -+ cc.has_function('close_range', prefix: '#include ')) - config_host_data.set('CONFIG_ACCEPT4', cc.has_function('accept4')) - config_host_data.set('CONFIG_CLOCK_ADJTIME', cc.has_function('clock_adjtime')) - config_host_data.set('CONFIG_DUP3', cc.has_function('dup3'))