Revert "oeqa/selftest: test_testimage_virgl_gtk_sdl: run only if gtk or sdl are enabled in base config"
PATCH 1/4 Revert "oeqa/selftest: test_testimage_virgl_gtk_sdl: run only if gtk or sdl are enabled in base config"
From: Alexander Kanavin <[email protected]>
This reverts commit 617a0eb86219bb183202503e4f79c08030661f85.
This was merged in master, assuming that SDL UI frontend would be disabled next, to allow update to qemu 11.x where that fronted has a regression.
Now that it was decided we should try and fix (or help fix) the actual issue in that frontend [1], keeping this change would effectively disable testing of the Gtk+ UI frontend (which is not enabled by default), which is an undesirable regression in testing.
[1] https://lists.openembedded.org/g/openembedded-architecture/message/2393
--- meta/lib/oeqa/selftest/cases/runtime_test.py | 32 +++++++++----------- 1 file changed, 14 insertions(+), 18 deletions(-)
meta/lib/oeqa/selftest/cases/runtime_test.py +14 -18
@@ -249,29 +249,25 @@ TEST_RUNQEMUPARAMS += " slirp" qemu_packageconfig = get_bb_var('PACKAGECONFIG', 'qemu-system-native') qemu_distrofeatures = get_bb_var('DISTRO_FEATURES', 'qemu-system-native') features = 'IMAGE_CLASSES += "testimage"\n' - - if 'gtk+' not in qemu_packageconfig and 'sdl' not in qemu_packageconfig: - self.skipTest("Neither gtk+ nor sdl enabled in qemu-system-native; the test requires at least one") - + if 'gtk+' not in qemu_packageconfig: + features += 'PACKAGECONFIG:append:pn-qemu-system-native = " gtk+"\n' + if 'sdl' not in qemu_packageconfig: + features += 'PACKAGECONFIG:append:pn-qemu-system-native = " sdl"\n' if 'opengl' not in qemu_distrofeatures: features += 'DISTRO_FEATURES:append = " opengl"\n' features += 'TEST_SUITES = "ping ssh virgl"\n' features += 'IMAGE_FEATURES:append = " ssh-server-dropbear"\n' features += 'IMAGE_INSTALL:append = " kmscube"\n' - - if 'gtk+' in qemu_packageconfig: - features_gtk = features + 'TEST_RUNQEMUPARAMS += " gtk gl"\n' - self.write_config(features_gtk) - with mock.patch.dict(os.environ, {"DISPLAY": display}): - bitbake('core-image-minimal') - bitbake('-c testimage core-image-minimal') - - if 'sdl' in qemu_packageconfig: - features_sdl = features + 'TEST_RUNQEMUPARAMS += " sdl gl"\n' - self.write_config(features_sdl) - with mock.patch.dict(os.environ, {"DISPLAY": display}): - bitbake('core-image-minimal') - bitbake('-c testimage core-image-minimal') + features_gtk = features + 'TEST_RUNQEMUPARAMS += " gtk gl"\n' + self.write_config(features_gtk) + with mock.patch.dict(os.environ, {"DISPLAY": display}): + bitbake('core-image-minimal') + bitbake('-c testimage core-image-minimal') + features_sdl = features + 'TEST_RUNQEMUPARAMS += " sdl gl"\n' + self.write_config(features_sdl) + with mock.patch.dict(os.environ, {"DISPLAY": display}): + bitbake('core-image-minimal') + bitbake('-c testimage core-image-minimal') @skipIfNotMachine("qemux86-64", "test needs qemux86-64") def test_testimage_virgl_headless(self):
Signature · 1 line
2.47.3
PATCH 2/4 qemu: upgrade 10.2.0 -> 11.0.0
From: Alexander Kanavin <[email protected]>
Upgrade QEMU to version 11.0.0.
Main changes:
- QEMU 11.0.0 has officially dropped all support for 32-bit host systems. This includes the ability to build the system emulator (softmmu) on any 32-bit host architecture. Add COMPATIBLE_HOST for class-target and class-nativesdk to restrict builds to 64-bit architectures. Fix SDK build failure when SDKMACHINE is 32-bit.
Note: QEMU 11.0.0 still supports emulating 32-bit guest architectures (such as qemu-system-i386 or qemu-system-arm) as long as they are running on a 64-bit host.
- qemu-targets.inc: skip linux-user targets when HOST_ARCH is not in the set of architectures supported by QEMU 11.0.0's linux-user mode (64-bit only: aarch64, loongarch64, mips64, ppc64, riscv64, s390x, sparc64, x86_64).
- Add --cpu=${TUNE_ARCH} to EXTRA_OECONF for class-target, and add --cpu=${SDK_ARCH} to nativesdk configure options to fix build failure. QEMU 11's configure script falls back to 'uname -m' (x86_64) when it cannot detect the host CPU.
- Add 0012-meson-fix-close_range-detection-on-older-glibc.patch:
the meson has_function('close_range') check succeeds at link time on hosts with kernel >= 5.9 even when glibc < 2.34 does not declare the function, causing implicit declaration errors. Add a prefix include so the check only succeeds when the header declares close_range().
- Add 0013-hw-scsi-vhost-scsi-include-standard-headers-for-vhost-worker-structs.patch:
on build hosts with kernel headers < 6.0, vhost-scsi.c fails to compile due to missing struct vhost_vring_worker/vhost_worker_state. Include QEMU's bundled standard-headers before the system header, matching the pattern already used in hw/virtio/vhost-backend.c.
- Drop fix-strerrorname_np.patch (fixed upstream).
Drop 0001-linux-user-elfload.c-Correction-to-HWCAP2-accessor.patch (fixed upstream).
Drop 0001-accel-tcg-Fix-iotlb_to_section-for-different-Address.patch (fixed upstream).
AI-Generated: kiro-cli
---
.../nativesdk-packagegroup-sdk-host.bb | 3 +-
.../qemu/nativesdk-qemu-helper_1.0.bb | 2 +
...native_10.2.0.bb => qemu-native_11.0.0.bb} | 1 -
...10.2.0.bb => qemu-system-native_11.0.0.bb} | 1 -
meta/recipes-devtools/qemu/qemu-targets.inc | 4 +
meta/recipes-devtools/qemu/qemu.inc | 26 +-
...tlb_to_section-for-different-Address.patch | 274 ------------------
...load.c-Correction-to-HWCAP2-accessor.patch | 42 ---
...n-environment-space-to-boot-loader-q.patch | 8 +-
.../0002-apic-fixup-fallthrough-to-PIC.patch | 6 +-
...mu-Do-not-include-file-if-not-exists.patch | 6 +-
...er-space-mmap-tweaks-to-address-musl.patch | 24 +-
.../qemu/0006-qemu-Determinism-fixes.patch | 4 +-
...d-use-relative-path-to-refer-to-file.patch | 6 +-
...and-MAP_SHARED_VALIDATE-on-needed-li.patch | 2 +-
...gure-lookup-meson-exutable-from-PATH.patch | 10 +-
...and-the-python-venv-aren-t-used-for-.patch | 10 +-
...close_range-detection-on-older-glibc.patch | 36 +++
...ard-headers-for-vhost-worker-structs.patch | 35 +++
.../qemu/qemu/fix-strerrorname_np.patch | 35 ---
.../qemu/{qemu_10.2.0.bb => qemu_11.0.0.bb} | 0
21 files changed, 127 insertions(+), 408 deletions(-)
rename meta/recipes-devtools/qemu/{qemu-native_10.2.0.bb => qemu-native_11.0.0.bb} (99%)
rename meta/recipes-devtools/qemu/{qemu-system-native_10.2.0.bb => qemu-system-native_11.0.0.bb} (99%)
delete mode 100644 meta/recipes-devtools/qemu/qemu/0001-accel-tcg-Fix-iotlb_to_section-for-different-Address.patch
delete mode 100644 meta/recipes-devtools/qemu/qemu/0001-linux-user-elfload.c-Correction-to-HWCAP2-accessor.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/0012-meson-fix-close_range-detection-on-older-glibc.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/0013-hw-scsi-vhost-scsi-include-standard-headers-for-vhost-worker-structs.patch
delete mode 100644 meta/recipes-devtools/qemu/qemu/fix-strerrorname_np.patch
rename meta/recipes-devtools/qemu/{qemu_10.2.0.bb => qemu_11.0.0.bb} (100%)meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb +1 -2
@@ -13,8 +13,7 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" # build some recent linux kernels (5.14+) for arm RDEPENDS:${PN} = "\ nativesdk-pkgconfig \ - nativesdk-qemu \ - nativesdk-qemu-helper \ + ${@'nativesdk-qemu nativesdk-qemu-helper' if d.getVar('SDK_ARCH') in ['x86_64', 'aarch64', 'ppc64', 'ppc64le', 'riscv64', 'loongarch64', 'mips64', 's390x', 'sparc64'] else ''} \ nativesdk-pseudo \ nativesdk-unfs3 \ nativesdk-opkg \
meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb +2 -0
@@ -1,5 +1,7 @@ SUMMARY = "Qemu helper scripts" LICENSE = "GPL-2.0-only" +# QEMU 11.0.0+ requires a 64-bit host architecture +COMPATIBLE_HOST = "(aarch64|x86_64|ppc64|riscv64|loongarch64|mips64|s390x|sparc64).*-linux" RDEPENDS:${PN} = "nativesdk-qemu nativesdk-unfs3 nativesdk-pseudo \ nativesdk-python3-shell nativesdk-python3-fcntl nativesdk-python3-logging \ "
meta/recipes-devtools/qemu/qemu-native_11.0.0.bb renamed from meta/recipes-devtools/qemu/qemu-native_10.2.0.bb +0 -1
@@ -7,4 +7,3 @@ require qemu-native.inc EXTRA_OECONF:append = " --target-list=${@get_qemu_usermode_target_list(d)} --disable-tools --disable-install-blobs --disable-guest-agent" PACKAGECONFIG ??= "pie" -
meta/recipes-devtools/qemu/qemu-system-native_11.0.0.bb renamed from meta/recipes-devtools/qemu/qemu-system-native_10.2.0.bb +0 -1
@@ -26,4 +26,3 @@ do_install:append() { rm -rf ${D}${datadir}/icons/ rm -rf ${D}${includedir}/qemu-plugin.h } -
meta/recipes-devtools/qemu/qemu-targets.inc +4 -0
@@ -25,6 +25,10 @@ def get_qemu_target_list(d): archs.remove(arch) if 'linux' not in tos: return softmmuonly + ''.join([arch + "-softmmu" + "," for arch in archs]).rstrip(',') + # QEMU 11.0.0+ only supports linux-user on 64-bit host architectures + linux_user_hosts = ['aarch64', 'loongarch64', 'mips64', 'ppc64', 'riscv64', 's390x', 'sparc64', 'x86_64'] + if tarch not in linux_user_hosts: + return softmmuonly + ''.join([arch + "-softmmu" + "," for arch in archs]).rstrip(',') return softmmuonly + linuxuseronly + ''.join([arch + "-linux-user" + "," + arch + "-softmmu" + "," for arch in archs]).rstrip(',') def get_qemu_usermode_target_list(d):
meta/recipes-devtools/qemu/qemu.inc +14 -12
@@ -4,6 +4,7 @@ machine's processor through dynamic binary translation and provides a set \ of different hardware and device models for the machine, enabling it to run \ a variety of guest operating systems" HOMEPAGE = "http://qemu.org" +BUGTRACKER = "https://gitlab.com/qemu-project/qemu/-/issues" LICENSE = "GPL-2.0-only & LGPL-2.1-only" DEPENDS += "bison-native meson-native ninja-native"
@@ -22,7 +23,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a3b50d8b88dcc0eb3d7d39b760b9e821 \ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://powerpc_rom.bin \ file://run-ptest \ - file://fix-strerrorname_np.patch \ file://0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch \ file://0002-apic-fixup-fallthrough-to-PIC.patch \ file://0004-qemu-Do-not-include-file-if-not-exists.patch \
@@ -32,8 +32,8 @@ 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://0001-linux-user-elfload.c-Correction-to-HWCAP2-accessor.patch \ - file://0001-accel-tcg-Fix-iotlb_to_section-for-different-Address.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 \ "
@@ -41,7 +41,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ UPSTREAM_CHECK_URI = "https://www.qemu.org" UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" -SRC_URI[sha256sum] = "9e30ad1b8b9f7b4463001582d1ab297f39cfccea5d08540c0ca6d6672785883a" +SRC_URI[sha256sum] = "c04ca36012653f32d11c674d370cf52a710e7d3f18c2d8b63e4932052a4854d6" 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."
@@ -61,6 +61,10 @@ COMPATIBLE_HOST:mipsarchn32 = "null" COMPATIBLE_HOST:mipsarchn64 = "null" COMPATIBLE_HOST:riscv32 = "null" +# QEMU 11.0.0+ requires a 64-bit host architecture for emulator builds +COMPATIBLE_HOST:class-target = "(aarch64|x86_64|ppc64|riscv64|loongarch64|mips64|s390x|sparc64).*-linux" +COMPATIBLE_HOST:class-nativesdk = "(aarch64|x86_64|ppc64|riscv64|loongarch64|mips64|s390x|sparc64).*-linux" + # Per https://lists.nongnu.org/archive/html/qemu-devel/2020-09/msg03873.html # upstream states qemu doesn't work without optimization DEBUG_BUILD = "0"
@@ -75,7 +79,7 @@ do_install_ptest() { find ${D}${PTEST_PATH}/tests -type f -name "*.[Sshcodp]" | xargs -i rm -rf {} # Don't check the file genreated by configure - sed -i -e "1s,#!/usr/bin/bash,#!${base_bindir}/bash," ${D}${PTEST_PATH}/tests/data/acpi/disassemle-aml.sh + sed -i -e "1s,#!/usr/bin/bash,#!${base_bindir}/bash," ${D}${PTEST_PATH}/tests/data/acpi/disassemble-aml.sh # Strip the paths from the QEMU variable, we can use PATH makfiles=$(find ${D}${PTEST_PATH} -name "*.mak")
@@ -119,19 +123,17 @@ EXTRA_OECONF = " \ ${PACKAGECONFIG_CONFARGS} \ " -EXTRA_OECONF:append:class-target = " --cross-prefix=${HOST_PREFIX}" -EXTRA_OECONF:append:class-nativesdk = " --cross-prefix=${HOST_PREFIX}" +EXTRA_OECONF:append:class-target = " --cross-prefix=${HOST_PREFIX} --cpu=${TUNE_ARCH}" +EXTRA_OECONF:append:class-nativesdk = " --cross-prefix=${HOST_PREFIX} --cpu=${@d.getVar('SDK_ARCH').replace('i686', 'i386')}" B = "${WORKDIR}/build" #EXTRA_OECONF:append = " --python=${HOSTTOOLS_DIR}/python3" do_configure:prepend:class-native() { - # Append build host pkg-config paths for native target since the host may provide sdl - BHOST_PKGCONFIG_PATH=$(PATH=/usr/bin:/bin pkg-config --variable pc_path pkg-config || echo "") - if [ ! -z "$BHOST_PKGCONFIG_PATH" ]; then - export PKG_CONFIG_LIBDIR=$PKG_CONFIG_LIBDIR:$BHOST_PKGCONFIG_PATH - fi + # Avoid leaking host pkg-config paths which may find incompatible + # old system libraries (e.g. glib-2.0, fixesproto, gtk+-3.0) + export PKG_CONFIG_PATH="${STAGING_LIBDIR_NATIVE}/pkgconfig:${STAGING_DATADIR_NATIVE}/pkgconfig" } do_configure() {
meta/recipes-devtools/qemu/qemu/0001-accel-tcg-Fix-iotlb_to_section-for-different-Address.patch deleted +0 -274
274 lines not on this page · raw message
meta/recipes-devtools/qemu/qemu/0001-linux-user-elfload.c-Correction-to-HWCAP2-accessor.patch deleted +0 -42
42 lines not on this page · raw message
meta/recipes-devtools/qemu/qemu/0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch +4 -4
@@ -1,10 +1,10 @@ -From f2d9bc614f7edf66412209aba78aa086e65dc75e Mon Sep 17 00:00:00 2001 +From a84184c98cf296954e0c757604e969b8565eb474 Mon Sep 17 00:00:00 2001 From: Jason Wessel <[email protected]> Date: Fri, 28 Mar 2014 17:42:43 +0800 Subject: [PATCH] qemu: Add addition environment space to boot loader qemu-system-mips -Upstream-Status: Inappropriate - OE uses deep paths +Upstream-Status: Inappropriate [OE uses deep paths] If you create a project with very long directory names like 128 characters deep and use NFS, the kernel arguments will be truncated. The kernel will
@@ -18,10 +18,10 @@ Signed-off-by: Roy Li <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/mips/malta.c b/hw/mips/malta.c -index cbdbb2105..62681fdae 100644 +index 812ff64d8..daf929943 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c -@@ -65,7 +65,7 @@ +@@ -66,7 +66,7 @@ #define ENVP_PADDR 0x2000 #define ENVP_VADDR cpu_mips_phys_to_kseg0(NULL, ENVP_PADDR) #define ENVP_NB_ENTRIES 16
meta/recipes-devtools/qemu/qemu/0002-apic-fixup-fallthrough-to-PIC.patch +3 -3
@@ -1,4 +1,4 @@ -From 945af9ecc80653955cbdbb7d3e28dce61795b251 Mon Sep 17 00:00:00 2001 +From 0a688e763d91c2e0e11cbe960f405442a9f35417 Mon Sep 17 00:00:00 2001 From: Mark Asselstine <[email protected]> Date: Tue, 26 Feb 2013 11:43:28 -0500 Subject: [PATCH] apic: fixup fallthrough to PIC
@@ -33,10 +33,10 @@ Signed-off-by: Kai Kang <[email protected]> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/intc/apic.c b/hw/intc/apic.c -index aad253a..212b01f 100644 +index 8766ed00b..581fc6deb 100644 --- a/hw/intc/apic.c +++ b/hw/intc/apic.c -@@ -740,7 +740,7 @@ int apic_accept_pic_intr(APICCommonState *s) +@@ -741,7 +741,7 @@ int apic_accept_pic_intr(APICCommonState *s) { uint32_t lvt0;
meta/recipes-devtools/qemu/qemu/0004-qemu-Do-not-include-file-if-not-exists.patch +3 -3
@@ -1,4 +1,4 @@ -From f8c1614b204c1d64af906dc70dbf4a1534eb6b38 Mon Sep 17 00:00:00 2001 +From b38315a5a6f9fc033c72bb94ff258bb4b1ac8dd3 Mon Sep 17 00:00:00 2001 From: Oleksiy Obitotskyy <[email protected]> Date: Wed, 25 Mar 2020 21:21:35 +0200 Subject: [PATCH] qemu: Do not include file if not exists
@@ -16,10 +16,10 @@ Signed-off-by: Sakib Sajal <[email protected]> 1 file changed, 2 insertions(+) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index c236b2834..2a3527a87 100644 +index f4b74ad35..3da51ea83 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -119,7 +119,9 @@ +@@ -117,7 +117,9 @@ #include <linux/blkpg.h> #include <netpacket/packet.h> #include <linux/netlink.h>
meta/recipes-devtools/qemu/qemu/0005-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch +8 -16
@@ -1,4 +1,4 @@ -From 3621615790270449bf9c8a0777e8ef28eb762bf9 Mon Sep 17 00:00:00 2001 +From e4abb937ba5a6a476d31886e71e67006df22a664 Mon Sep 17 00:00:00 2001 From: Richard Purdie <[email protected]> Date: Fri, 8 Jan 2021 17:27:06 +0000 Subject: [PATCH] qemu: Add some user space mmap tweaks to address musl 32 bit
@@ -16,32 +16,24 @@ A better return value for the other cases of invalid addresses is EINVAL rather than ENOMEM so adjust the other part of the test to this. Upstream-Status: Submitted [https://lists.gnu.org/archive/html/qemu-devel/2021-01/msg01355.html] -Signed-off-by: Richard Purdie <[email protected] +Signed-off-by: Richard Purdie <[email protected]> --- - linux-user/mmap.c | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) + linux-user/mmap.c | 5 +++++ + 1 file changed, 5 insertions(+) diff --git a/linux-user/mmap.c b/linux-user/mmap.c -index 002e1e668..912839dec 100644 +index b635b6a21..a5a617516 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c -@@ -1109,12 +1109,16 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size, +@@ -1113,6 +1113,11 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size, int prot; void *host_addr; -- if (!guest_range_valid_untagged(old_addr, old_size) || -- ((flags & MREMAP_FIXED) && + if (!guest_range_valid_untagged(old_addr, old_size)) { + errno = EFAULT; + return -1; + } -+ -+ if (((flags & MREMAP_FIXED) && ++ + if (((flags & MREMAP_FIXED) && !guest_range_valid_untagged(new_addr, new_size)) || ((flags & MREMAP_MAYMOVE) == 0 && - !guest_range_valid_untagged(old_addr, new_size))) { -- errno = ENOMEM; -+ errno = EINVAL; - return -1; - } -
meta/recipes-devtools/qemu/qemu/0006-qemu-Determinism-fixes.patch +3 -1
@@ -1,4 +1,4 @@ -From 8b28a9376074067bc2d84d4f77d5c7a42433b31b Mon Sep 17 00:00:00 2001 +From e891928d2248e186c65979cf5a2ba0cff9d00824 Mon Sep 17 00:00:00 2001 From: Richard Purdie <[email protected]> Date: Mon, 1 Mar 2021 13:00:47 +0000 Subject: [PATCH] qemu: Determinism fixes
@@ -11,6 +11,8 @@ meson to pass relative paths but we can fix that in the script. Upstream-Status: Pending [some version of all/part of this may be accepted] RP 2021/3/1 + +Signed-off-by: Richard Purdie <[email protected]> --- scripts/decodetree.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/qemu/qemu/0007-tests-meson.build-use-relative-path-to-refer-to-file.patch +3 -3
@@ -1,4 +1,4 @@ -From 097b75ad8310143decab92f6d1744144e7a4809f Mon Sep 17 00:00:00 2001 +From ac9a866ac807cb1542f26df07b4aad3a06342a99 Mon Sep 17 00:00:00 2001 From: Changqing Li <[email protected]> Date: Thu, 14 Jan 2021 06:33:04 +0000 Subject: [PATCH] tests/meson.build: use relative path to refer to files
@@ -17,10 +17,10 @@ Signed-off-by: Changqing Li <[email protected]> 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/unit/meson.build b/tests/unit/meson.build -index d5248ae51..2c581f055 100644 +index 41e8b06c3..ce5df4957 100644 --- a/tests/unit/meson.build +++ b/tests/unit/meson.build -@@ -127,17 +127,17 @@ endif +@@ -124,17 +124,17 @@ endif if have_system tests += {
meta/recipes-devtools/qemu/qemu/0008-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch +1 -1
@@ -1,4 +1,4 @@ -From 9d5deb767523ea0d1aeecb9960244c702530acad Mon Sep 17 00:00:00 2001 +From c0bfd2c5556afcf4413c81b3fda54a62f2bdd8c8 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Mon, 21 Mar 2022 10:09:38 -0700 Subject: [PATCH] Define MAP_SYNC and MAP_SHARED_VALIDATE on needed linux
meta/recipes-devtools/qemu/qemu/0010-configure-lookup-meson-exutable-from-PATH.patch +5 -5
@@ -1,4 +1,4 @@ -From aaec67c133dddda7204d23964732b4b788cbc9ce Mon Sep 17 00:00:00 2001 +From e357ac91b04f733148defe8c133ae8b2085a9a23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= <[email protected]> Date: Wed, 22 May 2024 14:02:55 +0200 Subject: [PATCH] configure: lookup meson exutable from PATH
@@ -13,10 +13,10 @@ Signed-off-by: Kai Kang <[email protected]> 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/configure b/configure -index 82cace1..83bbda9 100755 +index eea903067..217af781f 100755 --- a/configure +++ b/configure -@@ -993,10 +993,7 @@ get_pwd() { +@@ -981,10 +981,7 @@ get_pwd() { fi }
@@ -26,5 +26,5 @@ index 82cace1..83bbda9 100755 -fi +meson=`which meson` - # Conditionally ensure Sphinx is installed. - + # On Haiku, meson might show up in a "non-packaged" subfolder instead, see + # https://github.com/haiku/haiku/blob/r1beta5/docs/user/storage/storageintro.dox
meta/recipes-devtools/qemu/qemu/0011-qemu-Ensure-pip-and-the-python-venv-aren-t-used-for-.patch +5 -5
@@ -1,4 +1,4 @@ -From c9f174b2f7b43e59e91f88c75c8b3e2ee30bfcdd Mon Sep 17 00:00:00 2001 +From 70fa360e5bf72b28960747da47d9b85e650ad312 Mon Sep 17 00:00:00 2001 From: Richard Purdie <[email protected]> Date: Wed, 22 May 2024 13:58:23 +0200 Subject: [PATCH] qemu: Ensure pip and the python venv aren't used for meson
@@ -29,10 +29,10 @@ Signed-off-by: Richard Purdie <[email protected]> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure -index 84e429409..1a9585e8e 100755 +index 217af781f..cf8666337 100755 --- a/configure +++ b/configure -@@ -981,14 +981,14 @@ python="$(command -v "$python")" +@@ -951,14 +951,14 @@ python="$(command -v "$python")" echo "python determined to be '$python'" echo "python version: $($python --version)"
@@ -47,5 +47,5 @@ index 84e429409..1a9585e8e 100755 -mkvenv="$python ${source_path}/python/scripts/mkvenv.py" +mkvenv=true - # Finish preparing the virtual environment using vendored .whl files - + # Finish preparing the virtual environment using vendored .whl files. + # Even if PyPI is allowed, we disallow it here to force installation
meta/recipes-devtools/qemu/qemu/0012-meson-fix-close_range-detection-on-older-glibc.patch new file +36 -0
@@ -0,0 +1,36 @@ +From: Quan Sun <[email protected]> +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 <unistd.h>, 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/[email protected]/] + +Signed-off-by: Quan Sun <[email protected]> +--- + meson.build | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index cf634dfcd8..a1b2c3d4e5 100644 +--- a/meson.build ++++ b/meson.build +@@ -2632,6 +2632,7 @@ 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 <unistd.h>')) + 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'))
meta/recipes-devtools/qemu/qemu/0013-hw-scsi-vhost-scsi-include-standard-headers-for-vhost-worker-structs.patch new file +35 -0
@@ -0,0 +1,35 @@ +From: Quan Sun <[email protected]> +Subject: [PATCH] hw/scsi/vhost-scsi: fix build with older kernel headers + +On build hosts with kernel headers older than 6.0, the system's +<linux/vhost_types.h> does not define struct vhost_vring_worker or +struct vhost_worker_state, causing compilation of vhost-scsi.c to +fail: + + error: storage size of 'vq_worker' isn't known + +Fix by including standard-headers/linux/vhost_types.h before the +system's <linux/vhost.h>, matching the existing pattern used in +hw/virtio/vhost-backend.c. QEMU's bundled header provides the +struct definitions, and its include guard prevents redefinition +when the system header pulls in its own vhost_types.h. + +Upstream-Status: Submitted [https://lore.kernel.org/qemu-devel/[email protected]/] + +Signed-off-by: Quan Sun <[email protected]> +--- + hw/scsi/vhost-scsi.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/hw/scsi/vhost-scsi.c b/hw/scsi/vhost-scsi.c +index 699863cc10..10e8fbe503 100644 +--- a/hw/scsi/vhost-scsi.c ++++ b/hw/scsi/vhost-scsi.c +@@ -15,6 +15,7 @@ + */ + + #include "qemu/osdep.h" ++#include "standard-headers/linux/vhost_types.h" + #include <linux/vhost.h> + #include <sys/ioctl.h> + #include "qapi/error.h"
meta/recipes-devtools/qemu/qemu/fix-strerrorname_np.patch deleted +0 -35
@@ -1,35 +0,0 @@ -From 475dbdbee7ff878d113f45a1a623e9abbf0e55f3 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <[email protected]> -Date: Wed, 18 Sep 2024 16:19:37 -0700 -Subject: [PATCH] target/riscv/kvm: do not use non-portable strerrorname_np() - -strerrorname_np is non-portable and breaks building with musl libc. - -Use strerror(errno) instead, like we do other places. - -Upstream-Status: Submitted [https://mail.gnu.org/archive/html/qemu-stable/2023-12/msg00069.html] - -Cc: [email protected] -Fixes: commit 082e9e4a58ba (target/riscv/kvm: improve 'init_multiext_cfg' error -msg) -Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2041 -Buglink: https://gitlab.alpinelinux.org/alpine/aports/-/issues/15541 -Signed-off-by: Natanael Copa <[email protected]> ---- - target/riscv/kvm/kvm-cpu.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c -index e06d2126b..e1cc02fba 100644 ---- a/target/riscv/kvm/kvm-cpu.c -+++ b/target/riscv/kvm/kvm-cpu.c -@@ -1994,8 +1994,7 @@ static bool kvm_cpu_realize(CPUState *cs, Error **errp) - if (riscv_has_ext(&cpu->env, RVV)) { - ret = prctl(PR_RISCV_V_SET_CONTROL, PR_RISCV_V_VSTATE_CTRL_ON); - if (ret) { -- error_setg(errp, "Error in prctl PR_RISCV_V_SET_CONTROL, code: %s", -- strerrorname_np(errno)); -+ error_setg(errp, "Error in prctl PR_RISCV_V_SET_CONTROL, error %d", errno); - return false; - } - }
meta/recipes-devtools/qemu/qemu_11.0.0.bb renamed from meta/recipes-devtools/qemu/qemu_10.2.0.bb +0 -0
Signature · 1 line
2.47.3
PATCH 3/4 qemu: upgrade 11.0.0 -> 11.0.1
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
---
.../{qemu-native_11.0.0.bb => qemu-native_11.0.1.bb} | 0
...tem-native_11.0.0.bb => qemu-system-native_11.0.1.bb} | 0
meta/recipes-devtools/qemu/qemu.inc | 2 +-
...Add-addition-environment-space-to-boot-loader-q.patch | 2 +-
.../qemu/qemu/0002-apic-fixup-fallthrough-to-PIC.patch | 2 +-
.../0004-qemu-Do-not-include-file-if-not-exists.patch | 4 ++--
...Add-some-user-space-mmap-tweaks-to-address-musl.patch | 2 +-
.../qemu/qemu/0006-qemu-Determinism-fixes.patch | 2 +-
...-meson.build-use-relative-path-to-refer-to-file.patch | 2 +-
...e-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch | 2 +-
.../0010-configure-lookup-meson-exutable-from-PATH.patch | 2 +-
...Ensure-pip-and-the-python-venv-aren-t-used-for-.patch | 2 +-
...-meson-fix-close_range-detection-on-older-glibc.patch | 9 ++++++---
...clude-standard-headers-for-vhost-worker-structs.patch | 6 ++++--
.../qemu/{qemu_11.0.0.bb => qemu_11.0.1.bb} | 0
15 files changed, 21 insertions(+), 16 deletions(-)
rename meta/recipes-devtools/qemu/{qemu-native_11.0.0.bb => qemu-native_11.0.1.bb} (100%)
rename meta/recipes-devtools/qemu/{qemu-system-native_11.0.0.bb => qemu-system-native_11.0.1.bb} (100%)
rename meta/recipes-devtools/qemu/{qemu_11.0.0.bb => qemu_11.0.1.bb} (100%)meta/recipes-devtools/qemu/qemu-native_11.0.1.bb renamed from meta/recipes-devtools/qemu/qemu-native_11.0.0.bb +0 -0
meta/recipes-devtools/qemu/qemu-system-native_11.0.1.bb renamed from meta/recipes-devtools/qemu/qemu-system-native_11.0.0.bb +0 -0
meta/recipes-devtools/qemu/qemu.inc +1 -1
@@ -41,7 +41,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ UPSTREAM_CHECK_URI = "https://www.qemu.org" UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" -SRC_URI[sha256sum] = "c04ca36012653f32d11c674d370cf52a710e7d3f18c2d8b63e4932052a4854d6" +SRC_URI[sha256sum] = "0d235f5820278d914a3155ec27af8e4258d697ea892895570807d69c0cb8cd64" 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."
meta/recipes-devtools/qemu/qemu/0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch +1 -1
@@ -1,4 +1,4 @@ -From a84184c98cf296954e0c757604e969b8565eb474 Mon Sep 17 00:00:00 2001 +From ae20f7ba1494b3593761a96b2300a9df9c5f6040 Mon Sep 17 00:00:00 2001 From: Jason Wessel <[email protected]> Date: Fri, 28 Mar 2014 17:42:43 +0800 Subject: [PATCH] qemu: Add addition environment space to boot loader
meta/recipes-devtools/qemu/qemu/0002-apic-fixup-fallthrough-to-PIC.patch +1 -1
@@ -1,4 +1,4 @@ -From 0a688e763d91c2e0e11cbe960f405442a9f35417 Mon Sep 17 00:00:00 2001 +From 6a739f00ffa39aaf42545a7d27aa4d696b5b1cf9 Mon Sep 17 00:00:00 2001 From: Mark Asselstine <[email protected]> Date: Tue, 26 Feb 2013 11:43:28 -0500 Subject: [PATCH] apic: fixup fallthrough to PIC
meta/recipes-devtools/qemu/qemu/0004-qemu-Do-not-include-file-if-not-exists.patch +2 -2
@@ -1,4 +1,4 @@ -From b38315a5a6f9fc033c72bb94ff258bb4b1ac8dd3 Mon Sep 17 00:00:00 2001 +From d0bbf4a782b7caa452d91bd31512c2c625988670 Mon Sep 17 00:00:00 2001 From: Oleksiy Obitotskyy <[email protected]> Date: Wed, 25 Mar 2020 21:21:35 +0200 Subject: [PATCH] qemu: Do not include file if not exists
@@ -16,7 +16,7 @@ Signed-off-by: Sakib Sajal <[email protected]> 1 file changed, 2 insertions(+) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index f4b74ad35..3da51ea83 100644 +index 65bbeb855..3ed891bd2 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -117,7 +117,9 @@
meta/recipes-devtools/qemu/qemu/0005-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch +1 -1
@@ -1,4 +1,4 @@ -From e4abb937ba5a6a476d31886e71e67006df22a664 Mon Sep 17 00:00:00 2001 +From 7330a1ed776e5bfb322ecf36a1ee757127289895 Mon Sep 17 00:00:00 2001 From: Richard Purdie <[email protected]> Date: Fri, 8 Jan 2021 17:27:06 +0000 Subject: [PATCH] qemu: Add some user space mmap tweaks to address musl 32 bit
meta/recipes-devtools/qemu/qemu/0006-qemu-Determinism-fixes.patch +1 -1
@@ -1,4 +1,4 @@ -From e891928d2248e186c65979cf5a2ba0cff9d00824 Mon Sep 17 00:00:00 2001 +From 4f35bc947f61b8cc3af069e236c715a75a13d0f3 Mon Sep 17 00:00:00 2001 From: Richard Purdie <[email protected]> Date: Mon, 1 Mar 2021 13:00:47 +0000 Subject: [PATCH] qemu: Determinism fixes
meta/recipes-devtools/qemu/qemu/0007-tests-meson.build-use-relative-path-to-refer-to-file.patch +1 -1
@@ -1,4 +1,4 @@ -From ac9a866ac807cb1542f26df07b4aad3a06342a99 Mon Sep 17 00:00:00 2001 +From c4e2880b044a96a232d2d362f824c898292197a1 Mon Sep 17 00:00:00 2001 From: Changqing Li <[email protected]> Date: Thu, 14 Jan 2021 06:33:04 +0000 Subject: [PATCH] tests/meson.build: use relative path to refer to files
meta/recipes-devtools/qemu/qemu/0008-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch +1 -1
@@ -1,4 +1,4 @@ -From c0bfd2c5556afcf4413c81b3fda54a62f2bdd8c8 Mon Sep 17 00:00:00 2001 +From e3ab7c32d71f35577e8e28ac7cd671174739f435 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Mon, 21 Mar 2022 10:09:38 -0700 Subject: [PATCH] Define MAP_SYNC and MAP_SHARED_VALIDATE on needed linux
meta/recipes-devtools/qemu/qemu/0010-configure-lookup-meson-exutable-from-PATH.patch +1 -1
@@ -1,4 +1,4 @@ -From e357ac91b04f733148defe8c133ae8b2085a9a23 Mon Sep 17 00:00:00 2001 +From 53b173fd19123b6fdcbfec3c0d458b074db09ced Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= <[email protected]> Date: Wed, 22 May 2024 14:02:55 +0200 Subject: [PATCH] configure: lookup meson exutable from PATH
meta/recipes-devtools/qemu/qemu/0011-qemu-Ensure-pip-and-the-python-venv-aren-t-used-for-.patch +1 -1
@@ -1,4 +1,4 @@ -From 70fa360e5bf72b28960747da47d9b85e650ad312 Mon Sep 17 00:00:00 2001 +From 79dbf4d366e322dc544c749679d8a1abbbc91b7e Mon Sep 17 00:00:00 2001 From: Richard Purdie <[email protected]> Date: Wed, 22 May 2024 13:58:23 +0200 Subject: [PATCH] qemu: Ensure pip and the python venv aren't used for meson
meta/recipes-devtools/qemu/qemu/0012-meson-fix-close_range-detection-on-older-glibc.patch +6 -3
@@ -1,4 +1,6 @@ +From b072e3d025da9d5f266683b0b12796796c4208b3 Mon Sep 17 00:00:00 2001 From: Quan Sun <[email protected]> +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
@@ -22,11 +24,12 @@ Signed-off-by: Quan Sun <[email protected]> 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index cf634dfcd8..a1b2c3d4e5 100644 +index 51f5f2851..4353200db 100644 --- a/meson.build +++ b/meson.build -@@ -2632,6 +2632,7 @@ endif - +@@ -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',
meta/recipes-devtools/qemu/qemu/0013-hw-scsi-vhost-scsi-include-standard-headers-for-vhost-worker-structs.patch +4 -2
@@ -1,4 +1,6 @@ +From 6b613dae1eb1bad99fce6ee28f3c67fd0561b527 Mon Sep 17 00:00:00 2001 From: Quan Sun <[email protected]> +Date: Fri, 5 Jun 2026 11:54:58 +0000 Subject: [PATCH] hw/scsi/vhost-scsi: fix build with older kernel headers On build hosts with kernel headers older than 6.0, the system's
@@ -22,12 +24,12 @@ Signed-off-by: Quan Sun <[email protected]> 1 file changed, 1 insertion(+) diff --git a/hw/scsi/vhost-scsi.c b/hw/scsi/vhost-scsi.c -index 699863cc10..10e8fbe503 100644 +index 699863cc1..10e8fbe50 100644 --- a/hw/scsi/vhost-scsi.c +++ b/hw/scsi/vhost-scsi.c @@ -15,6 +15,7 @@ */ - + #include "qemu/osdep.h" +#include "standard-headers/linux/vhost_types.h" #include <linux/vhost.h>
meta/recipes-devtools/qemu/qemu_11.0.1.bb renamed from meta/recipes-devtools/qemu/qemu_11.0.0.bb +0 -0
Signature · 1 line
2.47.3
PATCH 4/4 qemu: add a workaround patch to address crashes in x11-only setups
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
--- meta/recipes-devtools/qemu/qemu.inc | 1 + ...disable-SDL_HINT_VIDEO_X11_FORCE_EGL.patch | 28 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 meta/recipes-devtools/qemu/qemu/0001-ui-sdl2.c-force-disable-SDL_HINT_VIDEO_X11_FORCE_EGL.patch
meta/recipes-devtools/qemu/qemu.inc +1 -0
@@ -36,6 +36,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ 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 \ " # file index at download.qemu.org isn't reliable: https://gitlab.com/qemu-project/qemu-web/-/issues/9 UPSTREAM_CHECK_URI = "https://www.qemu.org"
meta/recipes-devtools/qemu/qemu/0001-ui-sdl2.c-force-disable-SDL_HINT_VIDEO_X11_FORCE_EGL.patch new file +28 -0
@@ -0,0 +1,28 @@ +From ba4efe836c488d00e0f44929ee45feb3b1c1e014 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Wed, 10 Jun 2026 15:00:26 +0200 +Subject: [PATCH] ui/sdl2.c: force-disable SDL_HINT_VIDEO_X11_FORCE_EGL, + +This is problematic in X11-only environments, as it sets +SDL on a code path that ends in a crash: +https://gitlab.com/qemu-project/qemu/-/work_items/3540 + +Upstream-Status: Inappropriate [yocto-specific workaround] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + ui/sdl2.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ui/sdl2.c b/ui/sdl2.c +index 987ad334b..b4c8a50de 100644 +--- a/ui/sdl2.c ++++ b/ui/sdl2.c +@@ -871,7 +871,7 @@ static void sdl2_set_hint_x11_force_egl(void) + * It's always safe to set the hint even if X11 is not used by SDL. + * SDL will work regardless of the hint. + */ +- SDL_SetHint(SDL_HINT_VIDEO_X11_FORCE_EGL, "1"); ++ //SDL_SetHint(SDL_HINT_VIDEO_X11_FORCE_EGL, "1"); + eglTerminate(egl_display); + } +
Signature · 1 line
2.47.3