Skip to content

Commit 235cdb6

Browse files
nashifnashif
committed
hosttools: Update to Qemu 10.0.2
Update qemu to 10.0.2 Signed-off-by: Anas Nashif <anas.nashif@intel.com>
1 parent c84158d commit 235cdb6

17 files changed

+105
-73
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From c4c7e54d418f2a61188c85be05320d51ff1244a3 Mon Sep 17 00:00:00 2001
1+
From 7524720962d103fbf7c324b43aa84f26b6cc8835 Mon Sep 17 00:00:00 2001
22
From: Max Filippov <jcmvbkbc@gmail.com>
33
Date: Thu, 14 Dec 2023 18:08:26 -0800
4-
Subject: [PATCH 1/5] target/xtensa: add translation for wsr.mpucfg
4+
Subject: [PATCH 01/16] target/xtensa: add translation for wsr.mpucfg
55

66
Although MPUCFG is not writable, the opcode wsr.mpucfg is defined and it
77
just does nothing. Define wsr.mpucfg as nop.
@@ -12,10 +12,10 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
1212
1 file changed, 9 insertions(+)
1313

1414
diff --git a/target/xtensa/translate.c b/target/xtensa/translate.c
15-
index f4da4a40f9..80efc87c8f 100644
15+
index 4f02cefde3..18ca37f0fe 100644
1616
--- a/target/xtensa/translate.c
1717
+++ b/target/xtensa/translate.c
18-
@@ -5303,6 +5303,15 @@ static const XtensaOpcodeOps core_ops[] = {
18+
@@ -5304,6 +5304,15 @@ static const XtensaOpcodeOps core_ops[] = {
1919
XTENSA_OPTION_TRACE_PORT,
2020
},
2121
.op_flags = XTENSA_OP_PRIVILEGED,

‎meta-zephyr-sdk/recipes-devtools/qemu/files/0002-target-xtensa-import-sample_controller32-core.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 73b26889b8e68efee58d3a3bef4e3672c7b166fc Mon Sep 17 00:00:00 2001
1+
From a46011e8eadebc4d8021f6a8522fa0ed52e89428 Mon Sep 17 00:00:00 2001
22
From: Max Filippov <jcmvbkbc@gmail.com>
33
Date: Thu, 14 Dec 2023 16:47:09 -0800
4-
Subject: [PATCH 2/5] target/xtensa: import sample_controller32 core
4+
Subject: [PATCH 02/16] target/xtensa: import sample_controller32 core
55

66
This is an LX core with MPU and exclusive access options.
77

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 7b358c875242cd90ce64b175f9585c0da933b6b6 Mon Sep 17 00:00:00 2001
1+
From ad202784183a635c281749f67ed2411e879facb3 Mon Sep 17 00:00:00 2001
22
From: Max Filippov <jcmvbkbc@gmail.com>
33
Date: Thu, 14 Dec 2023 16:46:08 -0800
4-
Subject: [PATCH 3/5] tests/tcg/xtensa: tidy test linker script
4+
Subject: [PATCH 03/16] tests/tcg/xtensa: tidy test linker script
55

66
Drop MEMORY clause and related size definitions and output section
77
region specifications. Drop .rodata output section as the tests don't

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 21f01eb5a8dfa0ca7d4e4f9b2bf51b89ecc1e3b3 Mon Sep 17 00:00:00 2001
1+
From dd5194b56b7a6ca2faedccfd96137c0304abe394 Mon Sep 17 00:00:00 2001
22
From: Max Filippov <jcmvbkbc@gmail.com>
33
Date: Thu, 14 Dec 2023 18:14:00 -0800
4-
Subject: [PATCH 4/5] tests/tcg/xtensa: fix SR test for configs with MPU
4+
Subject: [PATCH 04/16] tests/tcg/xtensa: fix SR test for configs with MPU
55

66
- atomctl is available not only in the presence of s32c1i, but also with
77
the exclusive access option

‎meta-zephyr-sdk/recipes-devtools/qemu/files/0005-target-xtensa-fix-sample_controller32-build-for-QEMU.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 1b83e396296f32f7fdd4cf430494e813e5573949 Mon Sep 17 00:00:00 2001
1+
From f427b780bb1241b675d7a710d224d233031b709d Mon Sep 17 00:00:00 2001
22
From: Daniel Leung <daniel.leung@intel.com>
33
Date: Tue, 14 May 2024 09:52:26 -0700
4-
Subject: [PATCH 5/5] target/xtensa: fix sample_controller32 build for QEMU 7
4+
Subject: [PATCH 05/16] target/xtensa: fix sample_controller32 build for QEMU 7
55

66
The original patches for adding sample_controller32 are based on
77
QEMU 9. The GDB stub header file is not in the same place between

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
From 1fcd2c937b1b7a2bc748f9828d242f7031d31c28 Mon Sep 17 00:00:00 2001
1+
From ab661500c3afa2ba48d8635089bc9985a149b5a0 Mon Sep 17 00:00:00 2001
22
From: Anas Nashif <anas.nashif@intel.com>
33
Date: Fri, 16 May 2025 17:58:04 -0400
4-
Subject: [PATCH] Revert "target/xtensa: Make use of 'segment' in pptlb helper
5-
less confusing"
4+
Subject: [PATCH 06/16] Revert "target/xtensa: Make use of 'segment' in pptlb
5+
helper less confusing"
66

77
This reverts commit b42ba4ea4322357fcbfcb0e6e613d79ede84de64.
88
---
99
target/xtensa/mmu_helper.c | 4 ++--
1010
1 file changed, 2 insertions(+), 2 deletions(-)
1111

1212
diff --git a/target/xtensa/mmu_helper.c b/target/xtensa/mmu_helper.c
13-
index 29b84d5dbf..997b21d389 100644
13+
index 63be741a42..d05226c788 100644
1414
--- a/target/xtensa/mmu_helper.c
1515
+++ b/target/xtensa/mmu_helper.c
16-
@@ -991,7 +991,7 @@ uint32_t HELPER(rptlb1)(CPUXtensaState *env, uint32_t s)
16+
@@ -992,7 +992,7 @@ uint32_t HELPER(rptlb1)(CPUXtensaState *env, uint32_t s)
1717
uint32_t HELPER(pptlb)(CPUXtensaState *env, uint32_t v)
1818
{
1919
unsigned nhits;
@@ -22,7 +22,7 @@ index 29b84d5dbf..997b21d389 100644
2222
unsigned bg_segment;
2323

2424
nhits = xtensa_mpu_lookup(env->mpu_fg, env->config->n_mpu_fg_segments,
25-
@@ -1005,7 +1005,7 @@ uint32_t HELPER(pptlb)(CPUXtensaState *env, uint32_t v)
25+
@@ -1006,7 +1006,7 @@ uint32_t HELPER(pptlb)(CPUXtensaState *env, uint32_t v)
2626
xtensa_mpu_lookup(env->config->mpu_bg,
2727
env->config->n_mpu_bg_segments,
2828
v, &bg_segment);

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 29dce25c090792e360a1c1ff081af25d63d7df29 Mon Sep 17 00:00:00 2001
1+
From 42a7273b1d4fd681a432d40bc4092c3487b3a556 Mon Sep 17 00:00:00 2001
22
From: Jason Wessel <jason.wessel@windriver.com>
33
Date: Fri, 28 Mar 2014 17:42:43 +0800
4-
Subject: [PATCH] qemu: Add addition environment space to boot loader
4+
Subject: [PATCH 07/16] qemu: Add addition environment space to boot loader
55
qemu-system-mips
66

77
Upstream-Status: Inappropriate - OE uses deep paths
@@ -18,10 +18,10 @@ Signed-off-by: Roy Li <rongqing.li@windriver.com>
1818
1 file changed, 1 insertion(+), 1 deletion(-)
1919

2020
diff --git a/hw/mips/malta.c b/hw/mips/malta.c
21-
index 198da5ba3..736bf0999 100644
21+
index 8e9cea70b1..2268a8b618 100644
2222
--- a/hw/mips/malta.c
2323
+++ b/hw/mips/malta.c
24-
@@ -64,7 +64,7 @@
24+
@@ -65,7 +65,7 @@
2525
#define ENVP_PADDR 0x2000
2626
#define ENVP_VADDR cpu_mips_phys_to_kseg0(NULL, ENVP_PADDR)
2727
#define ENVP_NB_ENTRIES 16
@@ -30,3 +30,6 @@ index 198da5ba3..736bf0999 100644
3030

3131
/* Hardware addresses */
3232
#define FLASH_ADDRESS 0x1e000000ULL
33+
--
34+
2.43.0
35+

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From e069c66ccf29fb13ef5938b68f5362737b64d638 Mon Sep 17 00:00:00 2001
1+
From d98f52b978273b4ee394f7ee3c00fdf966a0c2ec Mon Sep 17 00:00:00 2001
22
From: Mark Asselstine <mark.asselstine@windriver.com>
33
Date: Tue, 26 Feb 2013 11:43:28 -0500
4-
Subject: [PATCH] apic: fixup fallthrough to PIC
4+
Subject: [PATCH 08/16] apic: fixup fallthrough to PIC
55

66
Commit 0e21e12bb311c4c1095d0269dc2ef81196ccb60a [Don't route PIC
77
interrupts through the local APIC if the local APIC config says so.]
@@ -29,10 +29,10 @@ Signed-off-by: He Zhe <zhe.he@windriver.com>
2929
1 file changed, 1 insertion(+), 1 deletion(-)
3030

3131
diff --git a/hw/intc/apic.c b/hw/intc/apic.c
32-
index 4186c57b3..43cd805a9 100644
32+
index d18c1dbf2c..45dde1fc51 100644
3333
--- a/hw/intc/apic.c
3434
+++ b/hw/intc/apic.c
35-
@@ -759,7 +759,7 @@ int apic_accept_pic_intr(DeviceState *dev)
35+
@@ -758,7 +758,7 @@ int apic_accept_pic_intr(DeviceState *dev)
3636
APICCommonState *s = APIC(dev);
3737
uint32_t lvt0;
3838

@@ -41,3 +41,6 @@ index 4186c57b3..43cd805a9 100644
4141
return -1;
4242

4343
lvt0 = s->lvt[APIC_LVT_LINT0];
44+
--
45+
2.43.0
46+

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 24e16b32dd0a4136ac30f8e2d48e266892814de6 Mon Sep 17 00:00:00 2001
1+
From 19b994a2d608eabfa52e8f327ae6dc0ea3653181 Mon Sep 17 00:00:00 2001
22
From: Oleksiy Obitotskyy <oobitots@cisco.com>
33
Date: Wed, 25 Mar 2020 21:21:35 +0200
4-
Subject: [PATCH] qemu: Do not include file if not exists
4+
Subject: [PATCH 09/16] qemu: Do not include file if not exists
55

66
Script configure checks for if_alg.h and check failed but
77
if_alg.h still included.
@@ -16,10 +16,10 @@ Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
1616
1 file changed, 2 insertions(+)
1717

1818
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
19-
index 549e39e19..439c7beb0 100644
19+
index 8bfe4912e1..d04984f66b 100644
2020
--- a/linux-user/syscall.c
2121
+++ b/linux-user/syscall.c
22-
@@ -116,7 +116,9 @@
22+
@@ -118,7 +118,9 @@
2323
#include <linux/blkpg.h>
2424
#include <netpacket/packet.h>
2525
#include <linux/netlink.h>
@@ -29,3 +29,6 @@ index 549e39e19..439c7beb0 100644
2929
#include <linux/rtc.h>
3030
#include <sound/asound.h>
3131
#ifdef HAVE_BTRFS_H
32+
--
33+
2.43.0
34+

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
From ef7497674b2d41cffcb90f36bfe145c4951a03ba Mon Sep 17 00:00:00 2001
1+
From 923be76163f1e7a178431ee65c4867cb8e1a2fef Mon Sep 17 00:00:00 2001
22
From: Richard Purdie <richard.purdie@linuxfoundation.org>
33
Date: Fri, 8 Jan 2021 17:27:06 +0000
4-
Subject: [PATCH] qemu: Add some user space mmap tweaks to address musl 32 bit
4+
Subject: [PATCH 10/16] qemu: Add some user space mmap tweaks to address musl
5+
32 bit
56

67
When using qemu-i386 to build qemux86 webkitgtk on musl, it sits in an
78
infinite loop of mremap calls of ever decreasing/increasing addresses.
@@ -22,10 +23,10 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org
2223
1 file changed, 7 insertions(+), 3 deletions(-)
2324

2425
diff --git a/linux-user/mmap.c b/linux-user/mmap.c
25-
index e4bf5d5f3..04d920c11 100644
26+
index d1f36e6f16..26ccf8f4dd 100644
2627
--- a/linux-user/mmap.c
2728
+++ b/linux-user/mmap.c
28-
@@ -1105,12 +1105,16 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size,
29+
@@ -1108,12 +1108,16 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size,
2930
int prot;
3031
void *host_addr;
3132

@@ -45,3 +46,6 @@ index e4bf5d5f3..04d920c11 100644
4546
return -1;
4647
}
4748

49+
--
50+
2.43.0
51+

0 commit comments

Comments
 (0)