[0.17-branch] hosttools: update qemu to 9.2.3

meta-zephyr-sdk/recipes-devtools/qemu/files/0001-Revert-target-xtensa-Make-use-of-segment-in-pptlb-he.patch

@@ -0,0 +1,36 @@
+From 1fcd2c937b1b7a2bc748f9828d242f7031d31c28 Mon Sep 17 00:00:00 2001
+From: Anas Nashif <[email protected]>
+Date: Fri, 16 May 2025 17:58:04 -0400
+Subject: [PATCH] Revert "target/xtensa: Make use of 'segment' in pptlb helper
+ less confusing"
+
+This reverts commit b42ba4ea4322357fcbfcb0e6e613d79ede84de64.
+---
+ target/xtensa/mmu_helper.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/target/xtensa/mmu_helper.c b/target/xtensa/mmu_helper.c
+index 29b84d5dbf..997b21d389 100644
+--- a/target/xtensa/mmu_helper.c
++++ b/target/xtensa/mmu_helper.c
+@@ -991,7 +991,7 @@ uint32_t HELPER(rptlb1)(CPUXtensaState *env, uint32_t s)
+ uint32_t HELPER(pptlb)(CPUXtensaState *env, uint32_t v)
+ {
+     unsigned nhits;
+-    unsigned segment;
++    unsigned segment = XTENSA_MPU_PROBE_B;
+     unsigned bg_segment;
+
+     nhits = xtensa_mpu_lookup(env->mpu_fg, env->config->n_mpu_fg_segments,
+@@ -1005,7 +1005,7 @@ uint32_t HELPER(pptlb)(CPUXtensaState *env, uint32_t v)
+         xtensa_mpu_lookup(env->config->mpu_bg,
+                           env->config->n_mpu_bg_segments,
+                           v, &bg_segment);
+-        return env->config->mpu_bg[bg_segment].attr | XTENSA_MPU_PROBE_B;
++        return env->config->mpu_bg[bg_segment].attr | segment;
+     }
+ }
+
+-- 
+2.43.0
+

meta-zephyr-sdk/recipes-devtools/qemu/files/0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch

@@ -1,4 +1,4 @@
-From 930b75aeade33690cec4bf748a954401da2be782 Mon Sep 17 00:00:00 2001
+From 29dce25c090792e360a1c1ff081af25d63d7df29 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
@@ -18,7 +18,7 @@ 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 664a2ae0a..5124b158a 100644
+index 198da5ba3..736bf0999 100644
 --- a/hw/mips/malta.c
 +++ b/hw/mips/malta.c
 @@ -64,7 +64,7 @@

meta-zephyr-sdk/recipes-devtools/qemu/files/0001-target-xtensa-add-translation-for-wsr.mpucfg.patch

@@ -1,7 +1,7 @@
-From 40de936cb535e9645d562ef32ef70d224f4f80ec Mon Sep 17 00:00:00 2001
+From c4c7e54d418f2a61188c85be05320d51ff1244a3 Mon Sep 17 00:00:00 2001
 From: Max Filippov <[email protected]>
 Date: Thu, 14 Dec 2023 18:08:26 -0800
-Subject: [PATCH 1/4] target/xtensa: add translation for wsr.mpucfg
+Subject: [PATCH 1/5] target/xtensa: add translation for wsr.mpucfg
 
 Although MPUCFG is not writable, the opcode wsr.mpucfg is defined and it
 just does nothing. Define wsr.mpucfg as nop.

meta-zephyr-sdk/recipes-devtools/qemu/files/0002-apic-fixup-fallthrough-to-PIC.patch

@@ -1,4 +1,4 @@
-From 1ba58dbd2dce4e6ccaf3be3ad5c9ecc22565313f Mon Sep 17 00:00:00 2001
+From e069c66ccf29fb13ef5938b68f5362737b64d638 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-zephyr-sdk/recipes-devtools/qemu/files/0002-target-xtensa-import-sample_controller32-core.patch

@@ -1,7 +1,7 @@
-From f45b7fe1a7a5cbb2445f4bfd36a6a929fa22bef6 Mon Sep 17 00:00:00 2001
+From 73b26889b8e68efee58d3a3bef4e3672c7b166fc Mon Sep 17 00:00:00 2001
 From: Max Filippov <[email protected]>
 Date: Thu, 14 Dec 2023 16:47:09 -0800
-Subject: [PATCH 2/4] target/xtensa: import sample_controller32 core
+Subject: [PATCH 2/5] target/xtensa: import sample_controller32 core
 
 This is an LX core with MPU and exclusive access options.
 

meta-zephyr-sdk/recipes-devtools/qemu/files/0003-tests-tcg-xtensa-tidy-test-linker-script.patch

@@ -1,7 +1,7 @@
-From c700aa6373e4cee40cba849f3bbb4927165d7243 Mon Sep 17 00:00:00 2001
+From 7b358c875242cd90ce64b175f9585c0da933b6b6 Mon Sep 17 00:00:00 2001
 From: Max Filippov <[email protected]>
 Date: Thu, 14 Dec 2023 16:46:08 -0800
-Subject: [PATCH 3/4] tests/tcg/xtensa: tidy test linker script
+Subject: [PATCH 3/5] tests/tcg/xtensa: tidy test linker script
 
 Drop MEMORY clause and related size definitions and output section
 region specifications. Drop .rodata output section as the tests don't

meta-zephyr-sdk/recipes-devtools/qemu/files/0004-qemu-Do-not-include-file-if-not-exists.patch

@@ -1,4 +1,4 @@
-From 081c1e4ee93b22ec00136db45c36650427213c09 Mon Sep 17 00:00:00 2001
+From 24e16b32dd0a4136ac30f8e2d48e266892814de6 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 9d5415674..22df46859 100644
+index 549e39e19..439c7beb0 100644
 --- a/linux-user/syscall.c
 +++ b/linux-user/syscall.c
-@@ -117,7 +117,9 @@
+@@ -116,7 +116,9 @@
  #include <linux/blkpg.h>
  #include <netpacket/packet.h>
  #include <linux/netlink.h>

meta-zephyr-sdk/recipes-devtools/qemu/files/0004-tests-tcg-xtensa-fix-SR-test-for-configs-with-MPU.patch

@@ -1,7 +1,7 @@
-From f814bc5b4d16403b15fcd80b1678d12202dab0f2 Mon Sep 17 00:00:00 2001
+From 21f01eb5a8dfa0ca7d4e4f9b2bf51b89ecc1e3b3 Mon Sep 17 00:00:00 2001
 From: Max Filippov <[email protected]>
 Date: Thu, 14 Dec 2023 18:14:00 -0800
-Subject: [PATCH 4/4] tests/tcg/xtensa: fix SR test for configs with MPU
+Subject: [PATCH 4/5] tests/tcg/xtensa: fix SR test for configs with MPU
 
 - atomctl is available not only in the presence of s32c1i, but also with
   the exclusive access option

meta-zephyr-sdk/recipes-devtools/qemu/files/0005-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch

@@ -1,4 +1,4 @@
-From 76efeccfd73a76834ac1c75d3c94de1899085714 Mon Sep 17 00:00:00 2001
+From ef7497674b2d41cffcb90f36bfe145c4951a03ba 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-zephyr-sdk/recipes-devtools/qemu/files/0005-target-xtensa-fix-sample_controller32-build-for-QEMU.patch

@@ -0,0 +1,30 @@
+From 1b83e396296f32f7fdd4cf430494e813e5573949 Mon Sep 17 00:00:00 2001
+From: Daniel Leung <[email protected]>
+Date: Tue, 14 May 2024 09:52:26 -0700
+Subject: [PATCH 5/5] target/xtensa: fix sample_controller32 build for QEMU 7
+
+The original patches for adding sample_controller32 are based on
+QEMU 9. The GDB stub header file is not in the same place between
+these two version. So fix that for QEMU 7. This can be reverted
+when we move to QEMU 9.
+
+Signed-off-by: Daniel Leung <[email protected]>
+---
+ target/xtensa/core-sample_controller32.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/target/xtensa/core-sample_controller32.c b/target/xtensa/core-sample_controller32.c
+index 94e75ad6ef..1e6028bc17 100644
+--- a/target/xtensa/core-sample_controller32.c
++++ b/target/xtensa/core-sample_controller32.c
+@@ -1,6 +1,6 @@
+ #include "qemu/osdep.h"
+ #include "cpu.h"
+-#include "gdbstub/helpers.h"
++#include "exec/gdbstub.h"
+ #include "qemu/host-utils.h"
+
+ #include "core-sample_controller32/core-isa.h"
+-- 
+2.43.0
+

meta-zephyr-sdk/recipes-devtools/qemu/files/0006-qemu-Determinism-fixes.patch

@@ -1,4 +1,4 @@
-From 09e8fac984cea71867c0b7a05b0dd8f7025bd25a Mon Sep 17 00:00:00 2001
+From b0862cf4fecc11a181bc8c6602c7d09812148249 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-zephyr-sdk/recipes-devtools/qemu/files/0007-tests-meson.build-use-relative-path-to-refer-to-file.patch

@@ -1,4 +1,4 @@
-From 1a574aa22c9b3700af7e5c0901abef59c72bb874 Mon Sep 17 00:00:00 2001
+From 7bce3a9379b09dfa7d24a377a9f7f1c6a2f8bdde 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 490ab8182..d19ee5606 100644
+index d5248ae51..2c581f055 100644
 --- a/tests/unit/meson.build
 +++ b/tests/unit/meson.build
-@@ -128,17 +128,17 @@ endif
+@@ -127,17 +127,17 @@ endif
 
  if have_system
    tests += {

meta-zephyr-sdk/recipes-devtools/qemu/files/0008-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch

@@ -1,4 +1,4 @@
-From 06b5b26a0a1f7687576d90066e492cf2665fff1d Mon Sep 17 00:00:00 2001
+From 2c2fde4042578ee29714a6421c33e00c4301d744 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-zephyr-sdk/recipes-devtools/qemu/files/0010-configure-lookup-meson-exutable-from-PATH.patch

@@ -1,4 +1,4 @@
-From 2e9642b9001df523628ab2cacbbbf2b208c49437 Mon Sep 17 00:00:00 2001
+From b3435faf13837f487231a01c2dca45a260ae323c 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
@@ -9,10 +9,10 @@ Upstream-Status: Inappropriate [workaround, would need a real fix for upstream]
  1 file changed, 1 insertion(+), 6 deletions(-)
 
 diff --git a/configure b/configure
-index d08b71f14..af0bd2c66 100755
+index 18336376b..2b014b97c 100755
 --- a/configure
 +++ b/configure
-@@ -958,12 +958,7 @@ mkvenv="$python ${source_path}/python/scripts/mkvenv.py"
+@@ -1002,12 +1002,7 @@ mkvenv="$python ${source_path}/python/scripts/mkvenv.py"
  $mkvenv ensuregroup --dir "${source_path}/python/wheels" \
       ${source_path}/pythondeps.toml meson || exit 1
 

meta-zephyr-sdk/recipes-devtools/qemu/files/0011-qemu-Ensure-pip-and-the-python-venv-aren-t-used-for-.patch

@@ -1,4 +1,4 @@
-From 68a13afd6606c2aaf1f0debd325d7314aaa61411 Mon Sep 17 00:00:00 2001
+From 81b55a014b2e5f0863a5a3fd584168c9d4ce9eb8 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 af0bd2c66..88dab6a95 100755
+index 2b014b97c..45dc8b146 100755
 --- a/configure
 +++ b/configure
-@@ -944,14 +944,14 @@ python="$(command -v "$python")"
+@@ -988,14 +988,14 @@ python="$(command -v "$python")"
  echo "python determined to be '$python'"
  echo "python version: $($python --version)"
 

meta-zephyr-sdk/recipes-devtools/qemu/files/fix-strerrorname_np.patch

@@ -1,4 +1,4 @@
-From 9de5de85fa917af58e7bc9cdd88f8f7ef8da2ca9 Mon Sep 17 00:00:00 2001
+From 6e5a6d44950c48957f3906294b8efd6a76b91576 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()
@@ -20,10 +20,10 @@ Signed-off-by: Natanael Copa <[email protected]>
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c
-index f6e3156b8..fad9eb21c 100644
+index c53ca1f76..3c67129ef 100644
 --- a/target/riscv/kvm/kvm-cpu.c
 +++ b/target/riscv/kvm/kvm-cpu.c
-@@ -1859,8 +1859,7 @@ static bool kvm_cpu_realize(CPUState *cs, Error **errp)
+@@ -1870,8 +1870,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) {

meta-zephyr-sdk/recipes-devtools/qemu/qemu-zephyr_9.2.1.bb → meta-zephyr-sdk/recipes-devtools/qemu/qemu-zephyr_9.2.3.bb

@@ -38,6 +38,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
                     file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f"
 
 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 \
@@ -49,17 +50,20 @@ 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-sched_attr-Do-not-define-for-glibc-2.41.patch \
-           file://qemu-guest-agent.init \
-           file://qemu-guest-agent.udev \
            file://0001-target-xtensa-add-translation-for-wsr.mpucfg.patch \
            file://0002-target-xtensa-import-sample_controller32-core.patch \
            file://0003-tests-tcg-xtensa-tidy-test-linker-script.patch \
            file://0004-tests-tcg-xtensa-fix-SR-test-for-configs-with-MPU.patch \
+           file://0005-target-xtensa-fix-sample_controller32-build-for-QEMU.patch \
+           file://0001-Revert-target-xtensa-Make-use-of-segment-in-pptlb-he.patch \
+           file://qemu-guest-agent.init \
+           file://qemu-guest-agent.udev \
            "
+# 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"
 UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
 
-SRC_URI[sha256sum] = "b7b0782ead63a5373fdfe08e084d3949a9395ec196180286b841f78a464d169c"
+SRC_URI[sha256sum] = "baed494270c361bf69816acc84512e3efed71c7a23f76691642b80bc3de7693e"
 
 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."