Skip to content

Commit 9b7eb22

Browse files
committed
qemu: update to 9.2.1
Bump qemu to 9.2.1, using tarball for now, will go back to git repo maintained by us later. Signed-off-by: Anas Nashif <[email protected]>
1 parent 0bca118 commit 9b7eb22

23 files changed

+14181
-271
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
From 930b75aeade33690cec4bf748a954401da2be782 Mon Sep 17 00:00:00 2001
2+
From: Jason Wessel <[email protected]>
3+
Date: Fri, 28 Mar 2014 17:42:43 +0800
4+
Subject: [PATCH] qemu: Add addition environment space to boot loader
5+
qemu-system-mips
6+
7+
Upstream-Status: Inappropriate - OE uses deep paths
8+
9+
If you create a project with very long directory names like 128 characters
10+
deep and use NFS, the kernel arguments will be truncated. The kernel will
11+
accept longer strings such as 1024 bytes, but the qemu boot loader defaulted
12+
to only 256 bytes. This patch expands the limit.
13+
14+
Signed-off-by: Jason Wessel <[email protected]>
15+
Signed-off-by: Roy Li <[email protected]>
16+
---
17+
hw/mips/malta.c | 2 +-
18+
1 file changed, 1 insertion(+), 1 deletion(-)
19+
20+
diff --git a/hw/mips/malta.c b/hw/mips/malta.c
21+
index 664a2ae0a..5124b158a 100644
22+
--- a/hw/mips/malta.c
23+
+++ b/hw/mips/malta.c
24+
@@ -64,7 +64,7 @@
25+
#define ENVP_PADDR 0x2000
26+
#define ENVP_VADDR cpu_mips_phys_to_kseg0(NULL, ENVP_PADDR)
27+
#define ENVP_NB_ENTRIES 16
28+
-#define ENVP_ENTRY_SIZE 256
29+
+#define ENVP_ENTRY_SIZE 1024
30+
31+
/* Hardware addresses */
32+
#define FLASH_ADDRESS 0x1e000000ULL
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
From 7030c0cd98de9e6c42e69be314204727ae335912 Mon Sep 17 00:00:00 2001
2+
From: Khem Raj <[email protected]>
3+
Date: Thu, 10 Oct 2024 22:40:32 -0700
4+
Subject: [PATCH] sched_attr: Do not define for glibc >= 2.41
5+
6+
glibc 2.41+ has added [1] definitions for sched_setattr and sched_getattr functions
7+
and struct sched_attr. Therefore, it needs to be checked for here as well before
8+
defining sched_attr
9+
10+
Define sched_attr conditionally on SCHED_ATTR_SIZE_VER0
11+
12+
Fixes builds with glibc/trunk
13+
14+
[1] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=21571ca0d70302909cf72707b2a7736cf12190a0;hp=298bc488fdc047da37482f4003023cb9adef78f8
15+
16+
Upstream-Status: Submitted [https://patchwork.ozlabs.org/project/qemu-devel/patch/[email protected]/]
17+
Signed-off-by: Khem Raj <[email protected]>
18+
Cc: Laurent Vivier <[email protected]>
19+
Cc: Paolo Bonzini <[email protected]>
20+
---
21+
linux-user/syscall.c | 4 +++-
22+
1 file changed, 3 insertions(+), 1 deletion(-)
23+
24+
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
25+
index 27aa59594..b2c45b4c4 100644
26+
--- a/linux-user/syscall.c
27+
+++ b/linux-user/syscall.c
28+
@@ -361,7 +361,8 @@ _syscall3(int, sys_sched_getaffinity, pid_t, pid, unsigned int, len,
29+
#define __NR_sys_sched_setaffinity __NR_sched_setaffinity
30+
_syscall3(int, sys_sched_setaffinity, pid_t, pid, unsigned int, len,
31+
unsigned long *, user_mask_ptr);
32+
-/* sched_attr is not defined in glibc */
33+
+/* sched_attr is not defined in glibc < 2.41 */
34+
+#ifndef SCHED_ATTR_SIZE_VER0
35+
struct sched_attr {
36+
uint32_t size;
37+
uint32_t sched_policy;
38+
@@ -374,6 +375,7 @@ struct sched_attr {
39+
uint32_t sched_util_min;
40+
uint32_t sched_util_max;
41+
};
42+
+#endif
43+
#define __NR_sys_sched_getattr __NR_sched_getattr
44+
_syscall4(int, sys_sched_getattr, pid_t, pid, struct sched_attr *, attr,
45+
unsigned int, size, unsigned int, flags);
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
From 40de936cb535e9645d562ef32ef70d224f4f80ec Mon Sep 17 00:00:00 2001
2+
From: Max Filippov <[email protected]>
3+
Date: Thu, 14 Dec 2023 18:08:26 -0800
4+
Subject: [PATCH 1/4] target/xtensa: add translation for wsr.mpucfg
5+
6+
Although MPUCFG is not writable, the opcode wsr.mpucfg is defined and it
7+
just does nothing. Define wsr.mpucfg as nop.
8+
9+
Signed-off-by: Max Filippov <[email protected]>
10+
---
11+
target/xtensa/translate.c | 9 +++++++++
12+
1 file changed, 9 insertions(+)
13+
14+
diff --git a/target/xtensa/translate.c b/target/xtensa/translate.c
15+
index f4da4a40f9..80efc87c8f 100644
16+
--- a/target/xtensa/translate.c
17+
+++ b/target/xtensa/translate.c
18+
@@ -5303,6 +5303,15 @@ static const XtensaOpcodeOps core_ops[] = {
19+
XTENSA_OPTION_TRACE_PORT,
20+
},
21+
.op_flags = XTENSA_OP_PRIVILEGED,
22+
+ }, {
23+
+ .name = "wsr.mpucfg",
24+
+ .translate = translate_nop,
25+
+ .test_exceptions = test_exceptions_sr,
26+
+ .par = (const uint32_t[]){
27+
+ MPUCFG,
28+
+ XTENSA_OPTION_MPU,
29+
+ },
30+
+ .op_flags = XTENSA_OP_PRIVILEGED,
31+
}, {
32+
.name = "wsr.mpuenb",
33+
.translate = translate_wsr_mpuenb,
34+
--
35+
2.43.0
36+
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
From 1ba58dbd2dce4e6ccaf3be3ad5c9ecc22565313f Mon Sep 17 00:00:00 2001
2+
From: Mark Asselstine <[email protected]>
3+
Date: Tue, 26 Feb 2013 11:43:28 -0500
4+
Subject: [PATCH] apic: fixup fallthrough to PIC
5+
6+
Commit 0e21e12bb311c4c1095d0269dc2ef81196ccb60a [Don't route PIC
7+
interrupts through the local APIC if the local APIC config says so.]
8+
missed a check to ensure the local APIC is enabled. Since if the local
9+
APIC is disabled it doesn't matter what the local APIC config says.
10+
11+
If this check isn't done and the guest has disabled the local APIC the
12+
guest will receive a general protection fault, similar to what is seen
13+
here:
14+
15+
https://lists.gnu.org/archive/html/qemu-devel/2012-12/msg02304.html
16+
17+
The GPF is caused by an attempt to service interrupt 0xffffffff. This
18+
comes about since cpu_get_pic_interrupt() calls apic_accept_pic_intr()
19+
(with the local APIC disabled apic_get_interrupt() returns -1).
20+
apic_accept_pic_intr() returns 0 and thus the interrupt number which
21+
is returned from cpu_get_pic_interrupt(), and which is attempted to be
22+
serviced, is -1.
23+
24+
Signed-off-by: Mark Asselstine <[email protected]>
25+
Upstream-Status: Submitted [https://lists.gnu.org/archive/html/qemu-devel/2013-04/msg00878.html]
26+
Signed-off-by: He Zhe <[email protected]>
27+
---
28+
hw/intc/apic.c | 2 +-
29+
1 file changed, 1 insertion(+), 1 deletion(-)
30+
31+
diff --git a/hw/intc/apic.c b/hw/intc/apic.c
32+
index 4186c57b3..43cd805a9 100644
33+
--- a/hw/intc/apic.c
34+
+++ b/hw/intc/apic.c
35+
@@ -759,7 +759,7 @@ int apic_accept_pic_intr(DeviceState *dev)
36+
APICCommonState *s = APIC(dev);
37+
uint32_t lvt0;
38+
39+
- if (!s)
40+
+ if (!s || !(s->spurious_vec & APIC_SV_ENABLE))
41+
return -1;
42+
43+
lvt0 = s->lvt[APIC_LVT_LINT0];

0 commit comments

Comments
 (0)