diff --git a/meta/recipes-devtools/qemu/qemu-native_11.1.2.bb b/meta/recipes-devtools/qemu/qemu-native_11.1.3.bb similarity index 99% rename from meta/recipes-devtools/qemu/qemu-native_11.1.2.bb rename to meta/recipes-devtools/qemu/qemu-native_11.1.3.bb index a77953529b1..26fa84c1807 100644 --- a/meta/recipes-devtools/qemu/qemu-native_11.1.2.bb +++ b/meta/recipes-devtools/qemu/qemu-native_11.1.3.bb @@ -7,3 +7,4 @@ 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" + diff --git a/meta/recipes-devtools/qemu/qemu-system-native_11.1.2.bb b/meta/recipes-devtools/qemu/qemu-system-native_11.1.3.bb similarity index 99% rename from meta/recipes-devtools/qemu/qemu-system-native_11.1.2.bb rename to meta/recipes-devtools/qemu/qemu-system-native_11.1.3.bb index 7947499c5f1..62e8a0a83b0 100644 --- a/meta/recipes-devtools/qemu/qemu-system-native_11.1.2.bb +++ b/meta/recipes-devtools/qemu/qemu-system-native_11.1.3.bb @@ -26,3 +26,4 @@ do_install:append() { rm -rf ${D}${datadir}/icons/ rm -rf ${D}${includedir}/qemu-plugin.h } + diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index d441ebe8f3a..e16fd86c915 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -43,7 +43,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] = "731b5681e4bb18be313231579b8efd0296c5b015fa36dc533874b639ba838016" +SRC_URI[sha256sum] = "5a8289c7940dc77d3873c81a6c29ba3afe1446fc9d36e77fa1658cdbecb84b22" 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." diff --git a/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch b/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch index 1980b2407e1..0d86bb02575 100644 --- a/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch +++ b/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch @@ -1,4 +1,4 @@ -From 76727fef9006b0936846938b6f8bbbccd829a75f Mon Sep 17 00:00:00 2001 +From f6981f9aedd718c2f908a91be70bb58c9473eaa0 Mon Sep 17 00:00:00 2001 From: Jason Wessel Date: Fri, 28 Mar 2014 17:42:43 +0800 Subject: [PATCH] qemu: Add addition environment space to boot loader diff --git a/meta/recipes-devtools/qemu/qemu/0001-target-riscv-extract-sfence_vma_allowed-from-helper_.patch b/meta/recipes-devtools/qemu/qemu/0001-target-riscv-extract-sfence_vma_allowed-from-helper_.patch index 2ece946400c..f7442f49d1d 100644 --- a/meta/recipes-devtools/qemu/qemu/0001-target-riscv-extract-sfence_vma_allowed-from-helper_.patch +++ b/meta/recipes-devtools/qemu/qemu/0001-target-riscv-extract-sfence_vma_allowed-from-helper_.patch @@ -1,7 +1,7 @@ -From 8507fd6795753697f557d11e144568f1bf8a00cb Mon Sep 17 00:00:00 2001 +From d8aae0e53cee8810167f7718704e2adcd67b1f0f Mon Sep 17 00:00:00 2001 From: Trevor Gamblin Date: Mon, 24 Aug 2026 17:54:21 +0000 -Subject: [PATCH 1/3] target/riscv: extract sfence_vma_allowed() from +Subject: [PATCH] target/riscv: extract sfence_vma_allowed() from helper_tlb_flush() Create a new function to encapsulate the privilege/hypervisor checks @@ -16,7 +16,7 @@ Signed-off-by: Trevor Gamblin 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/target/riscv/tcg/op_helper.c b/target/riscv/tcg/op_helper.c -index 3e94005d2b..8039df2b48 100644 +index 3e94005d2..8039df2b4 100644 --- a/target/riscv/tcg/op_helper.c +++ b/target/riscv/tcg/op_helper.c @@ -588,18 +588,25 @@ void helper_wrs_nto(CPURISCVState *env) @@ -51,6 +51,3 @@ index 3e94005d2b..8039df2b48 100644 } } --- -2.55.0 - diff --git a/meta/recipes-devtools/qemu/qemu/0001-ui-sdl2.c-force-disable-SDL_HINT_VIDEO_X11_FORCE_EGL.patch b/meta/recipes-devtools/qemu/qemu/0001-ui-sdl2.c-force-disable-SDL_HINT_VIDEO_X11_FORCE_EGL.patch index abc55a4fe50..52dfb2a241b 100644 --- a/meta/recipes-devtools/qemu/qemu/0001-ui-sdl2.c-force-disable-SDL_HINT_VIDEO_X11_FORCE_EGL.patch +++ b/meta/recipes-devtools/qemu/qemu/0001-ui-sdl2.c-force-disable-SDL_HINT_VIDEO_X11_FORCE_EGL.patch @@ -1,4 +1,4 @@ -From bbd0cb5705e5dff0c4ad54c957f6f6d4617ad174 Mon Sep 17 00:00:00 2001 +From b5dd7847f0bd0f527b5ff9c9f69df5cd80108287 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 10 Jun 2026 15:00:26 +0200 Subject: [PATCH] ui/sdl2.c: force-disable SDL_HINT_VIDEO_X11_FORCE_EGL, diff --git a/meta/recipes-devtools/qemu/qemu/0002-apic-fixup-fallthrough-to-PIC.patch b/meta/recipes-devtools/qemu/qemu/0002-apic-fixup-fallthrough-to-PIC.patch index 974fb3923b2..846164c835a 100644 --- a/meta/recipes-devtools/qemu/qemu/0002-apic-fixup-fallthrough-to-PIC.patch +++ b/meta/recipes-devtools/qemu/qemu/0002-apic-fixup-fallthrough-to-PIC.patch @@ -1,4 +1,4 @@ -From a499a56467f56f362c4a7e31d64265a47faefacb Mon Sep 17 00:00:00 2001 +From 8f0419ee02d265c0c92686b88053f08a99d113bf Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Tue, 26 Feb 2013 11:43:28 -0500 Subject: [PATCH] apic: fixup fallthrough to PIC diff --git a/meta/recipes-devtools/qemu/qemu/0002-target-riscv-add-helper_tlb_flush_page.patch b/meta/recipes-devtools/qemu/qemu/0002-target-riscv-add-helper_tlb_flush_page.patch index c272a80b085..9b29acb9739 100644 --- a/meta/recipes-devtools/qemu/qemu/0002-target-riscv-add-helper_tlb_flush_page.patch +++ b/meta/recipes-devtools/qemu/qemu/0002-target-riscv-add-helper_tlb_flush_page.patch @@ -1,7 +1,7 @@ -From eb8773847363989d9396492a3c9bc517ca04959f Mon Sep 17 00:00:00 2001 +From a6da8e0d87a06e2ed39e3fe37693fb3335a3bb39 Mon Sep 17 00:00:00 2001 From: Trevor Gamblin Date: Mon, 24 Aug 2026 17:54:45 +0000 -Subject: [PATCH 2/3] target/riscv: add helper_tlb_flush_page() +Subject: [PATCH] target/riscv: add helper_tlb_flush_page() Add a page-level counterpart to helper_tlb_flush(), and condition its internal call to tlb_flush_page() on return value from the new @@ -16,10 +16,10 @@ Signed-off-by: Trevor Gamblin 2 files changed, 8 insertions(+) diff --git a/target/riscv/helper.h b/target/riscv/helper.h -index 4fc2d3a155..652f85a5c7 100644 +index 542b7c264..2b88888f8 100644 --- a/target/riscv/helper.h +++ b/target/riscv/helper.h -@@ -137,6 +137,7 @@ DEF_HELPER_1(ctr_clear, void, env) +@@ -138,6 +138,7 @@ DEF_HELPER_1(ctr_clear, void, env) DEF_HELPER_1(wfi, void, env) DEF_HELPER_1(wrs_nto, void, env) DEF_HELPER_1(tlb_flush, void, env) @@ -28,7 +28,7 @@ index 4fc2d3a155..652f85a5c7 100644 DEF_HELPER_4(ctr_add_entry, void, env, tl, tl, tl) /* Native Debug */ diff --git a/target/riscv/tcg/op_helper.c b/target/riscv/tcg/op_helper.c -index 8039df2b48..723a45d181 100644 +index 8039df2b4..723a45d18 100644 --- a/target/riscv/tcg/op_helper.c +++ b/target/riscv/tcg/op_helper.c @@ -610,6 +610,13 @@ void helper_tlb_flush(CPURISCVState *env) @@ -45,6 +45,3 @@ index 8039df2b48..723a45d181 100644 void helper_tlb_flush_all(CPURISCVState *env) { CPUState *cs = env_cpu(env); --- -2.55.0 - diff --git a/meta/recipes-devtools/qemu/qemu/0003-target-riscv-use-a-targeted-TLB-page-flush-for-sfenc.patch b/meta/recipes-devtools/qemu/qemu/0003-target-riscv-use-a-targeted-TLB-page-flush-for-sfenc.patch index 36796e34f47..a20a19a6744 100644 --- a/meta/recipes-devtools/qemu/qemu/0003-target-riscv-use-a-targeted-TLB-page-flush-for-sfenc.patch +++ b/meta/recipes-devtools/qemu/qemu/0003-target-riscv-use-a-targeted-TLB-page-flush-for-sfenc.patch @@ -1,8 +1,8 @@ -From 858d6d9a587e4ed44f92e017375c5265bc40934b Mon Sep 17 00:00:00 2001 +From e53b203900cd5d04ac938b1ff4643667b6b63efa Mon Sep 17 00:00:00 2001 From: Trevor Gamblin Date: Mon, 24 Aug 2026 17:55:00 +0000 -Subject: [PATCH 3/3] target/riscv: use a targeted TLB page flush for - sfence.vma with a vaddr operand +Subject: [PATCH] target/riscv: use a targeted TLB page flush for sfence.vma + with a vaddr operand sfence.vma unconditionally called helper_tlb_flush(), regardless of the rs1 (vaddr) and rs2 (asid) operands, forcing a page-table walk on the @@ -26,10 +26,10 @@ Signed-off-by: Trevor Gamblin 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/target/riscv/tcg/insn_trans/trans_privileged.c.inc b/target/riscv/tcg/insn_trans/trans_privileged.c.inc -index a8eaccef67..8655fa332e 100644 +index ebbbb0117..2b1bb83bf 100644 --- a/target/riscv/tcg/insn_trans/trans_privileged.c.inc +++ b/target/riscv/tcg/insn_trans/trans_privileged.c.inc -@@ -155,7 +155,11 @@ static bool trans_sfence_vma(DisasContext *ctx, arg_sfence_vma *a) +@@ -156,7 +156,11 @@ static bool trans_sfence_vma(DisasContext *ctx, arg_sfence_vma *a) { #ifndef CONFIG_USER_ONLY decode_save_opc(ctx, 0); @@ -42,6 +42,3 @@ index a8eaccef67..8655fa332e 100644 return true; #endif return false; --- -2.55.0 - diff --git a/meta/recipes-devtools/qemu/qemu/0004-qemu-Do-not-include-file-if-not-exists.patch b/meta/recipes-devtools/qemu/qemu/0004-qemu-Do-not-include-file-if-not-exists.patch index b4750eb1499..aef0adbb72d 100644 --- a/meta/recipes-devtools/qemu/qemu/0004-qemu-Do-not-include-file-if-not-exists.patch +++ b/meta/recipes-devtools/qemu/qemu/0004-qemu-Do-not-include-file-if-not-exists.patch @@ -1,4 +1,4 @@ -From e9a86f3bd5392b12baddb9ee65335c9cda3cad56 Mon Sep 17 00:00:00 2001 +From d0aa68698cf780fac8be2b05a422a85b33b7d57a Mon Sep 17 00:00:00 2001 From: Oleksiy Obitotskyy 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 1 file changed, 2 insertions(+) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index cfa68dfbd..ab2cecbfb 100644 +index 9f454502c..99d433cea 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -117,7 +117,9 @@ diff --git a/meta/recipes-devtools/qemu/qemu/0005-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch b/meta/recipes-devtools/qemu/qemu/0005-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch index 7b7c653d73e..76220fa21ea 100644 --- a/meta/recipes-devtools/qemu/qemu/0005-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch +++ b/meta/recipes-devtools/qemu/qemu/0005-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch @@ -1,4 +1,4 @@ -From f92e779a55ab3e5d14884a4ea55369f7a16923d3 Mon Sep 17 00:00:00 2001 +From b0aea2f36b662c3089f509bfdfcfb526a11a5a8d Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 8 Jan 2021 17:27:06 +0000 Subject: [PATCH] qemu: Add some user space mmap tweaks to address musl 32 bit diff --git a/meta/recipes-devtools/qemu/qemu/0006-qemu-Determinism-fixes.patch b/meta/recipes-devtools/qemu/qemu/0006-qemu-Determinism-fixes.patch index 655d7802933..d5f5d0ae63c 100644 --- a/meta/recipes-devtools/qemu/qemu/0006-qemu-Determinism-fixes.patch +++ b/meta/recipes-devtools/qemu/qemu/0006-qemu-Determinism-fixes.patch @@ -1,4 +1,4 @@ -From 3186be2d62be9211bdb63fd2c2bc201567c72a2e Mon Sep 17 00:00:00 2001 +From a1e90f7dea2ec307ea7e3360ad83cfcb4198e3a9 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 1 Mar 2021 13:00:47 +0000 Subject: [PATCH] qemu: Determinism fixes 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 bdfbc7e7297..681f1b0d281 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 ae3bcb46784c43ba99e2e52bd38fea7cbc79543e Mon Sep 17 00:00:00 2001 +From 87302d3f04a325002cb9af880e49c94bf37855f6 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 @@ -21,10 +21,10 @@ Signed-off-by: Trevor Gamblin 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/unit/meson.build b/tests/unit/meson.build -index dc3fb954c..914845b22 100644 +index 885df4c0d..588098093 100644 --- a/tests/unit/meson.build +++ b/tests/unit/meson.build -@@ -127,17 +127,17 @@ endif +@@ -128,17 +128,17 @@ endif if have_system tests += { diff --git a/meta/recipes-devtools/qemu/qemu/0008-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch b/meta/recipes-devtools/qemu/qemu/0008-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch index 5686ca81fbd..8e5b39596dd 100644 --- a/meta/recipes-devtools/qemu/qemu/0008-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch +++ b/meta/recipes-devtools/qemu/qemu/0008-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch @@ -1,4 +1,4 @@ -From 0999c002153ab64befd3df4c5f35dbe3611d137f Mon Sep 17 00:00:00 2001 +From cfe68e5df5202b55225a607e85d9929835bd52fc Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 21 Mar 2022 10:09:38 -0700 Subject: [PATCH] Define MAP_SYNC and MAP_SHARED_VALIDATE on needed linux diff --git a/meta/recipes-devtools/qemu/qemu/0010-configure-lookup-meson-exutable-from-PATH.patch b/meta/recipes-devtools/qemu/qemu/0010-configure-lookup-meson-exutable-from-PATH.patch index 188f55cf037..01ce85c4b63 100644 --- a/meta/recipes-devtools/qemu/qemu/0010-configure-lookup-meson-exutable-from-PATH.patch +++ b/meta/recipes-devtools/qemu/qemu/0010-configure-lookup-meson-exutable-from-PATH.patch @@ -1,4 +1,4 @@ -From 13b84f40e56cf70d0a74a2a9fb51161b041a31bf Mon Sep 17 00:00:00 2001 +From 98b273b23aa857f10a4c27c1e12ff4d682d6051b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= Date: Wed, 22 May 2024 14:02:55 +0200 Subject: [PATCH] configure: lookup meson exutable from PATH diff --git a/meta/recipes-devtools/qemu/qemu/0011-qemu-Ensure-pip-and-the-python-venv-aren-t-used-for-.patch b/meta/recipes-devtools/qemu/qemu/0011-qemu-Ensure-pip-and-the-python-venv-aren-t-used-for-.patch index 456833c7f69..24fae81263d 100644 --- a/meta/recipes-devtools/qemu/qemu/0011-qemu-Ensure-pip-and-the-python-venv-aren-t-used-for-.patch +++ b/meta/recipes-devtools/qemu/qemu/0011-qemu-Ensure-pip-and-the-python-venv-aren-t-used-for-.patch @@ -1,4 +1,4 @@ -From 9b01ec57a976ed9e3b66f2ffbe5547ad9d0b05c8 Mon Sep 17 00:00:00 2001 +From 72842f2d3c17a6fbad4b06c4927a7dc9ba637c85 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 22 May 2024 13:58:23 +0200 Subject: [PATCH] qemu: Ensure pip and the python venv aren't used for meson diff --git a/meta/recipes-devtools/qemu/qemu_11.1.2.bb b/meta/recipes-devtools/qemu/qemu_11.1.3.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu_11.1.2.bb rename to meta/recipes-devtools/qemu/qemu_11.1.3.bb