Skip to content

Commit 3592813

Browse files
committed
hostools: update qemu to 9.2.3
Update qemu to 9.2.3 Signed-off-by: Anas Nashif <[email protected]>
1 parent 953c1bf commit 3592813

18 files changed

+66
-362
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 930b75aeade33690cec4bf748a954401da2be782 Mon Sep 17 00:00:00 2001
1+
From 29dce25c090792e360a1c1ff081af25d63d7df29 Mon Sep 17 00:00:00 2001
22
From: Jason Wessel <[email protected]>
33
Date: Fri, 28 Mar 2014 17:42:43 +0800
44
Subject: [PATCH] qemu: Add addition environment space to boot loader
@@ -18,7 +18,7 @@ Signed-off-by: Roy Li <[email protected]>
1818
1 file changed, 1 insertion(+), 1 deletion(-)
1919

2020
diff --git a/hw/mips/malta.c b/hw/mips/malta.c
21-
index 664a2ae0a..5124b158a 100644
21+
index 198da5ba3..736bf0999 100644
2222
--- a/hw/mips/malta.c
2323
+++ b/hw/mips/malta.c
2424
@@ -64,7 +64,7 @@

meta-zephyr-sdk/recipes-devtools/qemu/files/0001-sched_attr-Do-not-define-for-glibc-2.41.patch

Lines changed: 0 additions & 45 deletions
This file was deleted.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 40de936cb535e9645d562ef32ef70d224f4f80ec Mon Sep 17 00:00:00 2001
1+
From c4c7e54d418f2a61188c85be05320d51ff1244a3 Mon Sep 17 00:00:00 2001
22
From: Max Filippov <[email protected]>
33
Date: Thu, 14 Dec 2023 18:08:26 -0800
4-
Subject: [PATCH 1/4] target/xtensa: add translation for wsr.mpucfg
4+
Subject: [PATCH 1/5] 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.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 1ba58dbd2dce4e6ccaf3be3ad5c9ecc22565313f Mon Sep 17 00:00:00 2001
1+
From e069c66ccf29fb13ef5938b68f5362737b64d638 Mon Sep 17 00:00:00 2001
22
From: Mark Asselstine <[email protected]>
33
Date: Tue, 26 Feb 2013 11:43:28 -0500
44
Subject: [PATCH] apic: fixup fallthrough to PIC

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 f45b7fe1a7a5cbb2445f4bfd36a6a929fa22bef6 Mon Sep 17 00:00:00 2001
1+
From 73b26889b8e68efee58d3a3bef4e3672c7b166fc Mon Sep 17 00:00:00 2001
22
From: Max Filippov <[email protected]>
33
Date: Thu, 14 Dec 2023 16:47:09 -0800
4-
Subject: [PATCH 2/4] target/xtensa: import sample_controller32 core
4+
Subject: [PATCH 2/5] 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 c700aa6373e4cee40cba849f3bbb4927165d7243 Mon Sep 17 00:00:00 2001
1+
From 7b358c875242cd90ce64b175f9585c0da933b6b6 Mon Sep 17 00:00:00 2001
22
From: Max Filippov <[email protected]>
33
Date: Thu, 14 Dec 2023 16:46:08 -0800
4-
Subject: [PATCH 3/4] tests/tcg/xtensa: tidy test linker script
4+
Subject: [PATCH 3/5] 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-qemu-Do-not-include-file-if-not-exists.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 081c1e4ee93b22ec00136db45c36650427213c09 Mon Sep 17 00:00:00 2001
1+
From 24e16b32dd0a4136ac30f8e2d48e266892814de6 Mon Sep 17 00:00:00 2001
22
From: Oleksiy Obitotskyy <[email protected]>
33
Date: Wed, 25 Mar 2020 21:21:35 +0200
44
Subject: [PATCH] qemu: Do not include file if not exists
@@ -16,10 +16,10 @@ Signed-off-by: Sakib Sajal <[email protected]>
1616
1 file changed, 2 insertions(+)
1717

1818
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
19-
index 9d5415674..22df46859 100644
19+
index 549e39e19..439c7beb0 100644
2020
--- a/linux-user/syscall.c
2121
+++ b/linux-user/syscall.c
22-
@@ -117,7 +117,9 @@
22+
@@ -116,7 +116,9 @@
2323
#include <linux/blkpg.h>
2424
#include <netpacket/packet.h>
2525
#include <linux/netlink.h>

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 f814bc5b4d16403b15fcd80b1678d12202dab0f2 Mon Sep 17 00:00:00 2001
1+
From 21f01eb5a8dfa0ca7d4e4f9b2bf51b89ecc1e3b3 Mon Sep 17 00:00:00 2001
22
From: Max Filippov <[email protected]>
33
Date: Thu, 14 Dec 2023 18:14:00 -0800
4-
Subject: [PATCH 4/4] tests/tcg/xtensa: fix SR test for configs with MPU
4+
Subject: [PATCH 4/5] 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-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 76efeccfd73a76834ac1c75d3c94de1899085714 Mon Sep 17 00:00:00 2001
1+
From ef7497674b2d41cffcb90f36bfe145c4951a03ba Mon Sep 17 00:00:00 2001
22
From: Richard Purdie <[email protected]>
33
Date: Fri, 8 Jan 2021 17:27:06 +0000
44
Subject: [PATCH] qemu: Add some user space mmap tweaks to address musl 32 bit
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
From 1b83e396296f32f7fdd4cf430494e813e5573949 Mon Sep 17 00:00:00 2001
2+
From: Daniel Leung <[email protected]>
3+
Date: Tue, 14 May 2024 09:52:26 -0700
4+
Subject: [PATCH 5/5] target/xtensa: fix sample_controller32 build for QEMU 7
5+
6+
The original patches for adding sample_controller32 are based on
7+
QEMU 9. The GDB stub header file is not in the same place between
8+
these two version. So fix that for QEMU 7. This can be reverted
9+
when we move to QEMU 9.
10+
11+
Signed-off-by: Daniel Leung <[email protected]>
12+
---
13+
target/xtensa/core-sample_controller32.c | 2 +-
14+
1 file changed, 1 insertion(+), 1 deletion(-)
15+
16+
diff --git a/target/xtensa/core-sample_controller32.c b/target/xtensa/core-sample_controller32.c
17+
index 94e75ad6ef..1e6028bc17 100644
18+
--- a/target/xtensa/core-sample_controller32.c
19+
+++ b/target/xtensa/core-sample_controller32.c
20+
@@ -1,6 +1,6 @@
21+
#include "qemu/osdep.h"
22+
#include "cpu.h"
23+
-#include "gdbstub/helpers.h"
24+
+#include "exec/gdbstub.h"
25+
#include "qemu/host-utils.h"
26+
27+
#include "core-sample_controller32/core-isa.h"
28+
--
29+
2.43.0
30+

0 commit comments

Comments
 (0)